From 55159c48e31129c87b55d15d203df946ca33f884 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 21 Apr 2021 18:45:39 +0100
Subject: [PATCH] 1.32.2

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

diff --git a/CHANGES.md b/CHANGES.md
index a1349252c..f194f4db3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+Synapse 1.32.2 (2021-04-21)
+===========================
+
+This release includes fixes for the two regressions introduced in 1.32.0.
+
+Bugfixes
+--------
+
+- Fix a regression in Synapse v1.32.1 which caused `LoggingContext` errors in plugins. ([\#9857](https://github.com/matrix-org/synapse/issues/9857))
+
+
 Synapse 1.32.1 (2021-04-21)
 ===========================
 
diff --git a/changelog.d/9857.bugfix b/changelog.d/9857.bugfix
deleted file mode 100644
index 7eed41594..000000000
--- a/changelog.d/9857.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a regression in Synapse v1.32.1 which caused `LoggingContext` errors in plugins.
diff --git a/debian/changelog b/debian/changelog
index b8cf2cac5..9ebfc3c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.32.2) stable; urgency=medium
+
+  * New synapse release 1.32.2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 21 Apr 2021 18:43:52 +0100
+
 matrix-synapse-py3 (1.32.1) stable; urgency=medium
 
   * New synapse release 1.32.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index a0332d602..781f5ac3a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.32.1"
+__version__ = "1.32.2"
 
 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