From 2832ef5bb797df5938ba9a63af586a2d562d4570 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Fri, 11 Sep 2020 08:14:15 -0400
Subject: [PATCH] 1.20.0rc3

---
 CHANGES.md              | 9 +++++++++
 changelog.d/8291.bugfix | 1 -
 synapse/__init__.py     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/8291.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index dbef6ab6c..de8ce2625 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.20.0rc3 (2020-09-11)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.20.0rc1 that the wrong exception was raised when invalid JSON data is encountered. ([\#8291](https://github.com/matrix-org/synapse/issues/8291))
+
+
 Synapse 1.20.0rc2 (2020-09-09)
 ==============================
 
diff --git a/changelog.d/8291.bugfix b/changelog.d/8291.bugfix
deleted file mode 100644
index bc01d26f5..000000000
--- a/changelog.d/8291.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.20.0rc1 that the wrong exception was raised when invalid JSON data is encountered.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 7e8731f86..bf0bf192a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.20.0rc2"
+__version__ = "1.20.0rc3"
 
 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