Fold in changes.

b44103de · drebs · ef0d008b · b44103de · ef0d008b
Commit b44103de authored 10 years ago by drebs
--- a/CHANGELOG
+++ b/CHANGELOG
+0.6.3 Dec 16 2014:
+Client:
+  o Fix deferred encryption/decryption parameters (#6500).
+
+0.6.2 Dec 11 2014:
+Client:
+  o Fix incorrect ssl context setup.
+
 0.6.1 Dec 08 2014:
 Client:
  o Use TLS v1 in soledad client. Fixes partially #6437

--- a/client/changes/bug_6500_fix-deferred-enc-dec
+++ b/client/changes/bug_6500_fix-deferred-enc-dec
-  o Fix deferred encryption/decryption parameters (#6500).