Merge version 1.10.3-1+rpi1 and 1.10.4-2 to produce 1.10.4-2+rpi1

diff --cc debian/changelog
index 6ca19fbb9d9e36c85b4df0e9b2af39e2aa56e96f,06f7e75f65a6cce32f31e34058b6b03f6c153692..decb97193eed8a61c7b80f9b96f1c5f9963053a4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,26 @@@
- golang-1.10 (1.10.3-1+rpi1) buster-staging; urgency=medium
++golang-1.10 (1.10.4-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.10~rc2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Feb 2018 12:22:04 +0000]
 +  * Build with GOARM=6
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jun 2018 21:05:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Sep 2018 15:03:24 +0000
++
+ golang-1.10 (1.10.4-2) unstable; urgency=medium
+ 
+   * d/patches/arm64-arm64asm-recognise-new-ssbb-pssbb-mnemonics-fr.patch:
+     backport another ftbfs fix from upstream.
+ 
+  -- Michael Hudson-Doyle <mwhudson@debian.org>  Fri, 21 Sep 2018 11:30:09 +0200
+ 
+ golang-1.10 (1.10.4-1) unstable; urgency=medium
+ 
+   * New upstream version.
+   * d/patches/only-consider-executable-segments.patch: backport ftbfs fix from
+     upstream. 
+ 
+  -- Michael Hudson-Doyle <mwhudson@debian.org>  Wed, 19 Sep 2018 10:03:11 +0200
  
  golang-1.10 (1.10.3-1) unstable; urgency=medium