From d7b88c879a682551768c46e54f3e9856cd382226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 18 Oct 2013 09:05:37 -0300 Subject: Fold in changes --- keymanager/CHANGELOG | 4 ++++ keymanager/changes/feature_4030-add-cipher-and-digest-algo | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 keymanager/changes/feature_4030-add-cipher-and-digest-algo 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. -- cgit v1.2.3