summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-18 09:05:37 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-18 09:05:37 -0300
commit4cd1e5e6cb4f6014cc01ade07e84c959535ab407 (patch)
tree9e893466da950038c38045b0335b7c2e4a723590
parent8189c837a4058d4b0b8ec35a1c705d374d6793c8 (diff)
Fold in changes
-rw-r--r--CHANGELOG4
-rw-r--r--changes/feature_4030-add-cipher-and-digest-algo2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6ec2624f..83714984 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+0.3.4 Oct 18:
+ o Add option to choose cipher and digest algorithms when signing and
+ encrypting. Closes #4030.
+
0.3.3 Oct 4:
o Add a sanity check for the correct version of gnupg.
o Update code to use gnupg 1.2.2 python module. Closes #2342.
diff --git a/changes/feature_4030-add-cipher-and-digest-algo b/changes/feature_4030-add-cipher-and-digest-algo
deleted file mode 100644
index a05e5894..00000000
--- a/changes/feature_4030-add-cipher-and-digest-algo
+++ /dev/null
@@ -1,2 +0,0 @@
- o Add option to choose cipher and digest algorithms when signing and
- encrypting. Closes #4030.