From 2abe641215b6435fa3c18ae802a621a23d01f643 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 8 Dec 2014 14:36:25 -0200 Subject: Fold in changes. --- CHANGELOG | 8 ++++++++ client/changes/bug_6437_use_tls | 1 - server/changes/bug_6436_run-daemon-as-user-soledad | 1 - server/changes/bug_6437_avoid-sslv3 | 1 - 4 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 client/changes/bug_6437_use_tls delete mode 100644 server/changes/bug_6436_run-daemon-as-user-soledad delete mode 100644 server/changes/bug_6437_avoid-sslv3 diff --git a/CHANGELOG b/CHANGELOG index 0dce4847..7cf5a3b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +0.6.1 Dec 08 2014: +Client: + o Use TLS v1 in soledad client. Fixes partially #6437 + +Server: + o Run daemon as user soledad (#6436). + o Avoid use of SSLv3 (#6437). + 0.6.0 Jul 18, 2014: Client: o Close all connections after syncing. Fixes #5518. diff --git a/client/changes/bug_6437_use_tls b/client/changes/bug_6437_use_tls deleted file mode 100644 index 7138d962..00000000 --- a/client/changes/bug_6437_use_tls +++ /dev/null @@ -1 +0,0 @@ - o Use TLS v1 in soledad client. Fixes partially #6437 diff --git a/server/changes/bug_6436_run-daemon-as-user-soledad b/server/changes/bug_6436_run-daemon-as-user-soledad deleted file mode 100644 index 886964f1..00000000 --- a/server/changes/bug_6436_run-daemon-as-user-soledad +++ /dev/null @@ -1 +0,0 @@ - o Run daemon as user soledad (#6436). diff --git a/server/changes/bug_6437_avoid-sslv3 b/server/changes/bug_6437_avoid-sslv3 deleted file mode 100644 index 5d41fbb3..00000000 --- a/server/changes/bug_6437_avoid-sslv3 +++ /dev/null @@ -1 +0,0 @@ - o Avoid use of SSLv3 (#6437). -- cgit v1.2.3