Merge version 3.6.1-4+rpi1 and 3.6.1.1-1 to produce 3.6.1.1-1+rpi1

diff --cc debian/changelog
index a2b0941a30eee639329f5ee2107e40d63bc442c0,cb870479e451355f07a12c65253c52f8ea168cb3..36ea1edc9e5777b54bd043a15e0127e073f42ed6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,15 @@@
- protobuf (3.6.1-4+rpi1) buster-staging; urgency=medium
++protobuf (3.6.1.1-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 3.6.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 25 Oct 2018 12:28:38 +0000]
 +  * Add armhf to libatomic architectures list.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 25 Oct 2018 12:28:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 04 Dec 2018 20:02:57 +0000
++
+ protobuf (3.6.1.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Mon, 26 Nov 2018 23:23:31 +0000
  
  protobuf (3.6.1-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge