Merge version 2.31-2+rpi1 and 2.31-3 to produce 2.31-3+rpi1

diff --cc debian/changelog
index f99c86f56935bab1445d4ef691efb771ff0dc41f,825252aeeb75add33e3c44dbba8f2186e178828f..c21cf2fcd10fa6cce296034edcb6f3c6e56a7338
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,29 +1,42 @@@
- glibc (2.31-2+rpi1) bullseye-staging; urgency=medium
++glibc (2.31-3+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, 30 Jul 2020 15:09:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 13 Aug 2020 16:13:44 +0000
++
+ glibc (2.31-3) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/control.in/libc: add a Breaks: against openarena (<< 0.8.8+dfsg-4~)
+     due to bug#966150.
+   * debian/control.in/libc: add a Breaks: against ioquake3
+     (<< 1.36+u20200211.f2c61c1~dfsg-2~) as previous versions are not correctly
+     linked with libm.
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix an infinite loop in the iconv program (CVE-2016-10228).  Closes:
+       #856503.
+     - debian/patches/any/submitted-selinux-deprecations.diff: upstreamed.
+     - debian/patches/x32/submitted-fix-nptl-setgroups-x32.diff: upstreamed.
+   * debian/rules.d/build.mk: install <finclude/math-vector-fortran.h> in the
+     multiarch path.  Closes: #962457.
+ 
+   [ Samuel Thibault ]
+   * debian/libc0.3.symbols.hurd-i386: Fix dependency of __errno_location and
+     __h_errno_location symbols in libpthread.
+   * patches/hurd-i386/unsubmitted-sbrk-_end.diff: Fix _end symbol appearance
+     by reworking sbrk.
+   * patches/hurd-i386/unsubmitted-sched_sets.diff: Add sched_set/getscheduler.
+   * patches/hurd-i386/git-pthread_atfork-hidden.diff: Hide pthread_atfork
+     symbols imported to applications, to avoid leaking them.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 04 Aug 2020 17:02:38 +0200
  
  glibc (2.31-2) unstable; urgency=medium