summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-09 14:47:14 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-09 14:47:14 -0300
commit9378f533f80f2a7f5f554f5bd1323e47abce9316 (patch)
treeb022589ffe6c989d25c4715f577686c6059134e1
parent573e76b1173f2f268bb0c9c62b1253a71f5f9987 (diff)
Fold in changes
-rw-r--r--CHANGELOG9
-rw-r--r--changes/feature_2662_thread_safe1
-rw-r--r--soledad/changes/bug_typos2
-rw-r--r--soledad_server/changes/bug_3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript2
4 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3338d5b6..057a46cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+0.3.0 Aug 9:
+Client:
+ o Thread safe wrapper for pysqlcipher.
+ o Fix a couple of typos that prevented certain functionality to
+ work. Fixes #3306
+Server:
+ o A plaintext port is not opened by soledad server initscript call
+ to twistd web anymore. Closes #3254.
+
0.2.3 Jul 26:
Client:
o Avoid possible timing attack in document's mac comparison by
diff --git a/changes/feature_2662_thread_safe b/changes/feature_2662_thread_safe
deleted file mode 100644
index f32ade59..00000000
--- a/changes/feature_2662_thread_safe
+++ /dev/null
@@ -1 +0,0 @@
- o Thread safe wrapper for pysqlcipher
diff --git a/soledad/changes/bug_typos b/soledad/changes/bug_typos
deleted file mode 100644
index 056881ec..00000000
--- a/soledad/changes/bug_typos
+++ /dev/null
@@ -1,2 +0,0 @@
- o Fix a couple of typos that prevented certain functionality to
- work. Fixes #3306 \ No newline at end of file
diff --git a/soledad_server/changes/bug_3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript b/soledad_server/changes/bug_3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript
deleted file mode 100644
index 51ad5a2c..00000000
--- a/soledad_server/changes/bug_3254-eliminate-need-of-passing-non-ssl-port-to-twistd-in-soledad-server-initscript
+++ /dev/null
@@ -1,2 +0,0 @@
- o A plaintext port is not opened by soledad server initscript call to twistd
- web anymore. Closes #3254.