Merge version 2.1.18-3+rpi1 and 2.1.18-4 to produce 2.1.18-4+rpi1

diff --cc debian/changelog
index f9440afeca3115cc738088d9912cca768b61e855,20160cbab8af817a0cde67112980e8954ff83f70..9ccb1f8ba395e6e37cfa857be82863eafbd53a9f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- xpa (2.1.18-3+rpi1) buster-staging; urgency=medium
++xpa (2.1.18-4+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 2.1.18-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 19:49:55 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 17 Aug 2017 19:49:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Jan 2018 09:06:38 +0000
++
+ xpa (2.1.18-4) unstable; urgency=medium
+ 
+   * Push Standards-Version to 4.1.3. Change remaining URLs to https
+   * Move package RCS to salsa
+   * Restrict test to "local" (Closes: #886200)
+   * Remove uintptr_t cast
+ 
+  -- Ole Streicher <olebole@debian.org>  Thu, 11 Jan 2018 21:17:38 +0100
  
  xpa (2.1.18-3) unstable; urgency=medium