Fold in changes

diff --git a/CHANGELOG b/CHANGELOG
index 6ec2624..8371498 100644 (file)
--- 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 (file)
index a05e589..0000000
--- 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.