diff options
author | drebs <drebs@leap.se> | 2014-12-08 14:36:25 -0200 |
---|---|---|
committer | drebs <drebs@leap.se> | 2014-12-08 14:36:48 -0200 |
commit | 2abe641215b6435fa3c18ae802a621a23d01f643 (patch) | |
tree | ab97f8612d503ec5b2ec315f0353b1a86eec7589 | |
parent | 527c28c73d22b5f852273e2c5d1713e82a2c49fd (diff) |
Fold in changes.
-rw-r--r-- | CHANGELOG | 8 | ||||
-rw-r--r-- | client/changes/bug_6437_use_tls | 1 | ||||
-rw-r--r-- | server/changes/bug_6436_run-daemon-as-user-soledad | 1 | ||||
-rw-r--r-- | server/changes/bug_6437_avoid-sslv3 | 1 |
4 files changed, 8 insertions, 3 deletions
@@ -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). |