Merge version 2.2.10-1+rpi1 and 2.2.10-2 to produce 2.2.10-2+rpi1

diff --cc debian/changelog
index 18eb471eaa18d8bcf03d4b13a2e8f7a8628d7a6b,c381f491f4d8713167ec4badf66b344c4c77a387..4f2c887583415e98c46cce283961ee527b6a2442
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- gnupg2 (2.2.10-1+rpi1) buster-staging; urgency=medium
++gnupg2 (2.2.10-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.2.9-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 25 Jul 2018 10:25:32 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 03 Sep 2018 01:13:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 04 Oct 2018 08:53:19 +0000
++
+ gnupg2 (2.2.10-2) unstable; urgency=medium
+ 
+   * import upstream minor bugfixes
+   * wrap-and-sort -ast
+   * actually ship gpgcompose in gnupg-utils
+   * drop debian/source/options (thanks, Lintian!)
+ 
+  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sun, 30 Sep 2018 11:40:42 -0500
  
  gnupg2 (2.2.10-1) unstable; urgency=medium