Merge version 6.3.1-2+rpi1 and 6.3.2-1 to produce 6.3.2-1+rpi1

diff --cc debian/changelog
index 9c0a09d827695f499137073b3996be2d05c84684,d8f13f1e9972a346f5632dfcb0f112390f8e485f..e6e7a6919be571595c60f274036721c215d4357f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- mercurial (6.3.1-2+rpi1) bookworm-staging; urgency=medium
++mercurial (6.3.2-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 6.1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 21 Apr 2022 22:42:37 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Dec 2022 23:11:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2023 19:47:46 +0000
++
+ mercurial (6.3.2-1) sid; urgency=medium
+ 
+   * New upstream bugfix release.
+   * from_upstream_stable.patch: pull in upstream changes up to changeset 812a9fbf4380
+   * cgitb.patch: stop importing cgitb to avoid deprecation warnings
+   * Skip test-remotefilelog-gc.t.
+   * This fixes compatibility with python 3.11 (closes: #1028815)
+   * Bump test timeout to 1800 because riscv64 is apparently even slower than
+     mips (closes: #1024867).
+ 
+  -- Julien Cristau <jcristau@debian.org>  Mon, 20 Feb 2023 18:44:46 +0100
  
  mercurial (6.3.1-2) sid; urgency=medium
  

diff --cc debian/rules
Simple merge