From e031c7e0cca2422aa2c5d3704adc66723d8094e7 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Tue, 20 Apr 2021 14:31:27 +0100
Subject: [PATCH]  1.32.0

---
 CHANGES.md              | 13 +++++++++++--
 changelog.d/9829.bugfix |  1 -
 debian/changelog        |  8 ++++++--
 synapse/__init__.py     |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/9829.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 41908f84b..4d48a321c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,5 @@
-Synapse 1.32.0rc1 (2021-04-13)
-==============================
+Synapse 1.32.0 (2021-04-20)
+===========================
 
 **Note:** This release requires Python 3.6+ and Postgres 9.6+ or SQLite 3.22+.
 
@@ -7,6 +7,15 @@ This release removes the deprecated `GET /_synapse/admin/v1/users/<user_id>` adm
 
 This release requires Application Services to use type `m.login.application_services` when registering users via the `/_matrix/client/r0/register` endpoint to comply with the spec. Please ensure your Application Services are up to date.
 
+Bugfixes
+--------
+
+- Fix the log lines of nested logging contexts. Broke in 1.32.0rc1. ([\#9829](https://github.com/matrix-org/synapse/issues/9829))
+
+
+Synapse 1.32.0rc1 (2021-04-13)
+==============================
+
 Features
 --------
 
diff --git a/changelog.d/9829.bugfix b/changelog.d/9829.bugfix
deleted file mode 100644
index d0c1e49fd..000000000
--- a/changelog.d/9829.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix the log lines of nested logging contexts.
diff --git a/debian/changelog b/debian/changelog
index 5d526316f..83be4497e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-matrix-synapse-py3 (1.31.0+nmu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.32.0) stable; urgency=medium
 
+  [ Dan Callahan ]
   * Skip tests when DEB_BUILD_OPTIONS contains "nocheck".
 
- -- Dan Callahan <danc@element.io>  Mon, 12 Apr 2021 13:07:36 +0000
+  [ Synapse Packaging team ]
+  * New synapse release 1.32.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 20 Apr 2021 14:28:39 +0100
 
 matrix-synapse-py3 (1.31.0) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 125a73d37..79232c4de 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.32.0rc1"
+__version__ = "1.32.0"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when