summaryrefslogtreecommitdiff
path: root/keymanager
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
commitd7b88c879a682551768c46e54f3e9856cd382226 (patch)
tree3b2faae3d7eccbc76a4745270c8b09f27592e7fd /keymanager
parent136c4d1c5c633543db69f1400c37dd5578ffa99b (diff)
Fold in changes
Diffstat (limited to 'keymanager')
-rw-r--r--keymanager/CHANGELOG4
-rw-r--r--keymanager/changes/feature_4030-add-cipher-and-digest-algo2
2 files changed, 4 insertions, 2 deletions
diff --git a/keymanager/CHANGELOG b/keymanager/CHANGELOG
index 6ec2624..8371498 100644
--- a/keymanager/CHANGELOG
+++ b/keymanager/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/keymanager/changes/feature_4030-add-cipher-and-digest-algo b/keymanager/changes/feature_4030-add-cipher-and-digest-algo
deleted file mode 100644
index a05e589..0000000
--- a/keymanager/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.