From ac88aca7f7acc2ce909db230682f93bb4e2ff73b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 6 May 2021 14:06:38 +0100
Subject: [PATCH] 1.33.1
---
CHANGES.md | 9 +++++++++
changelog.d/9937.bugfix | 1 -
debian/changelog | 6 ++++++
synapse/__init__.py | 2 +-
4 files changed, 16 insertions(+), 2 deletions(-)
delete mode 100644 changelog.d/9937.bugfix
diff --git a/CHANGES.md b/CHANGES.md
index 206859cff7..a41abbefba 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.33.1 (2021-05-06)
+===========================
+
+Bugfixes
+--------
+
+- Fix bug where `/sync` would break if using the latest version of `attrs` dependency, by pinning to a previous version. ([\#9937](https://github.com/matrix-org/synapse/issues/9937))
+
+
Synapse 1.33.0 (2021-05-05)
===========================
diff --git a/changelog.d/9937.bugfix b/changelog.d/9937.bugfix
deleted file mode 100644
index c1cc5ccb43..0000000000
--- a/changelog.d/9937.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where `/sync` would break if using the latest version of `attrs` dependency, by pinning to a previous version.
diff --git a/debian/changelog b/debian/changelog
index b54d3f2bc6..de50dd14ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.33.1) stable; urgency=medium
+
+ * New synapse release 1.33.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 06 May 2021 14:06:33 +0100
+
matrix-synapse-py3 (1.33.0) stable; urgency=medium
* New synapse release 1.33.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5eac40730a..441cd8b339 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
except ImportError:
pass
-__version__ = "1.33.0"
+__version__ = "1.33.1"
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
--
GitLab