From 258a9a9e8bea851493fc2275ac6b81639c997afb Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 28 May 2021 17:06:05 +0100
Subject: [PATCH] 1.35.0rc3

---
 CHANGES.md               | 16 ++++++++++++++++
 changelog.d/10082.bugfix |  1 -
 changelog.d/10091.misc   |  1 -
 changelog.d/10093.bugfix |  1 -
 synapse/__init__.py      |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/10082.bugfix
 delete mode 100644 changelog.d/10091.misc
 delete mode 100644 changelog.d/10093.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 1fac16580..8bd05c318 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,19 @@
+Synapse 1.35.0rc3 (2021-05-28)
+==============================
+
+Bugfixes
+--------
+
+- Fixed a bug causing replication requests to fail when receiving a lot of events via federation. ([\#10082](https://github.com/matrix-org/synapse/issues/10082))
+- Fix HTTP response size limit to allow joining very large rooms over federation. ([\#10093](https://github.com/matrix-org/synapse/issues/10093))
+
+
+Internal Changes
+----------------
+
+- Log method and path when dropping request due to size limit. ([\#10091](https://github.com/matrix-org/synapse/issues/10091))
+
+
 Synapse 1.35.0rc2 (2021-05-27)
 ==============================
 
diff --git a/changelog.d/10082.bugfix b/changelog.d/10082.bugfix
deleted file mode 100644
index b4f8bcc4f..000000000
--- a/changelog.d/10082.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug causing replication requests to fail when receiving a lot of events via federation.
diff --git a/changelog.d/10091.misc b/changelog.d/10091.misc
deleted file mode 100644
index dbe310fd1..000000000
--- a/changelog.d/10091.misc
+++ /dev/null
@@ -1 +0,0 @@
-Log method and path when dropping request due to size limit.
diff --git a/changelog.d/10093.bugfix b/changelog.d/10093.bugfix
deleted file mode 100644
index e50de4b2e..000000000
--- a/changelog.d/10093.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix HTTP response size limit to allow joining very large rooms over federation.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6faf31dbb..4591246bd 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.35.0rc2"
+__version__ = "1.35.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