Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Tue, 26 Sep 2017 10:00:03 +0000 (12:00 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 26 Sep 2017 10:00:03 +0000 (12:00 +0200)
commitcd2d758f3f9e0007ecd6bae9d2ee0d631773e237
tree0e1b9c898d0527969fa953e0f1fc418e610c8da4
parent0a76611294998ae34b9d9ebde484ef8ad3a9a3a6
parent93a2b7761297dc1d859126d7711abd35ba35d215
Merge branch 'STABLE-BRANCH-2-2' into master

--

Signed-off-by: Werner Koch <wk@gnupg.org>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.
NEWS
doc/wks.texi
g10/keygen.c