summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2014-12-16 13:05:19 -0200
committerdrebs <drebs@leap.se>2014-12-16 13:05:19 -0200
commitb44103de55cd9d2f347c344c23d71cb87d8d06cb (patch)
tree83e14f3be580cdbe854526a19eda937ac81c5c6c
parentef0d008b53ac214dc77fe572f2cc5d18efbd1b35 (diff)
Fold in changes.0.6.3
-rw-r--r--CHANGELOG8
-rw-r--r--client/changes/bug_6500_fix-deferred-enc-dec1
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7cf5a3b4..e3ada799 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+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
diff --git a/client/changes/bug_6500_fix-deferred-enc-dec b/client/changes/bug_6500_fix-deferred-enc-dec
deleted file mode 100644
index f3361507..00000000
--- a/client/changes/bug_6500_fix-deferred-enc-dec
+++ /dev/null
@@ -1 +0,0 @@
- o Fix deferred encryption/decryption parameters (#6500).