Merge version 2.31-12+rpi1 and 2.31-13 to produce 2.31-13+rpi1

diff --cc debian/changelog
index e14eb7c24bd2c4c75a4d1eb5b096d35a0a5dbd18,138f350aa28bd3cf029ab9e4acc276824157941a..7b4cbb2b5a95da770a83c5a66fcfa994e63ed719
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,15 +1,28 @@@
- glibc (2.31-12+rpi1) bullseye-staging; urgency=medium
++glibc (2.31-13+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
 +  * Disable testsuite.
 +
 +  [changes introduced in 2.29-9+rpi1 by Peter Michale Green]
 +  * Change mode on scripts/check-obsolete-constructs.py to 644, 
 +    dgit does not like mode 755 files created by patches and the
 +    script does not seem to be used for anything in the Debian
 +    package.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 27 May 2021 20:01:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Aug 2021 01:10:32 +0000
++
+ glibc (2.31-13) unstable; urgency=medium
+ 
+   [ Colin Watson ]
+   * debian/debhelper.in/libc.postinst, script.in/nsscheck.sh: Look for
+     openssh-server package rather than ssh.  Closes: #990069
+ 
+   [ Aurelien Jarno ]
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix an arbitrary read in wordexp() (CVE-2021-35942).  Closes:
+       #990542.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 06 Jul 2021 21:16:59 +0200
  
  glibc (2.31-12) unstable; urgency=medium