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)
--

Signed-off-by: Werner Koch <wk@gnupg.org>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.

1  2 
NEWS
doc/wks.texi
g10/keygen.c

diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,28 +1,30 @@@
 -Noteworthy changes in version 2.2.2 (unreleased)
 +Noteworthy changes in version 2.3.0 (unreleased)
  ------------------------------------------------
  
 -
 -Noteworthy changes in version 2.2.1 (2017-09-19)
 -------------------------------------------------
++  Changes also found in 2.2.1:
  
-  * Release dates of 2.2.x versions:
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Version 2.2.1 (unreleased)
+   * gpg: Fix formatting of the user id in batch mode key generation
+     if only "name-email" is given.
+   * gpgv: Fix annoying "not suitable for" warnings.
+   * wks: Convey only the newest user id to the provider.  This is the
+     case if different names are used with the same addr-spec.
+   * wks: Create a complying user id for provider policy mailbox-only.
+   * wks: Add workaround for posteo.de.
+   * scd: Fix the use of large ECC keys with an OpenPGP card.
+   * dirmngr: Use system provided root certificates if no specific HKP
+     certificates are configured.  If build with GNUTLS, this was
+     already the case.
++  Release dates of 2.2.x versions:
++  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++  Version 2.2.1 (2017-09-19)
 +
  
  Noteworthy changes in version 2.2.0 (2017-08-28)
  ------------------------------------------------
diff --cc doc/wks.texi
Simple merge
diff --cc g10/keygen.c
Simple merge