Merge version 1.30.2-2+rpi1 and 1.30.2-2.1 to produce 1.30.2-2.1+rpi1

diff --cc debian/changelog
index 7c11f9251ad345030534c662571c863002a2d167,ccf082e8fbf8d6ea38a533a9ba6ba21aa97fb1f9..ab729681632bfaae1d3a06ff8ef931fbb60d6412
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,18 +1,25 @@@
- grpc (1.30.2-2+rpi1) bullseye-staging; urgency=medium
++grpc (1.30.2-2.1+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.30.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Sep 2020 17:29:12 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Sep 2020 17:29:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jan 2021 10:22:42 +0000
++
+ grpc (1.30.2-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+ 
+   [ Debian Janitor ]
+   * Apply multi-arch hints.
+     + ruby-grpc: Add Multi-Arch: same.
+ 
+   [ Andreas Henriksson ]
+   * Mark protobuf-compiler-grpc Multi-Arch: foreign.
+     Thanks to Helmut for valuable insight and review. (Closes: #976651)
+   * Cherry-pick python grpcio 'is not' fix from upstream.
+     This fixes a FTBFS with python3.9 (current default in bullseye).
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Wed, 13 Jan 2021 22:53:15 +0100
  
  grpc (1.30.2-2) unstable; urgency=medium