1.39.0rc3

8 files changed, 25 insertions, 6 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 13d3654095..975394b476 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,21 @@
+Synapse 1.39.0rc3 (2021-07-28)
+==============================
+
+Bugfixes
+--------
+
+- Fix bug introduced in Synapse 1.38 which caused an exception at startup when SAML authentication was enabled. ([\#10477](https://github.com/matrix-org/synapse/issues/10477))
+- Fix a long-standing bug where Synapse would not inform clients that a device had exhausted its one-time-key pool, potentially causing problems decrypting events. ([\#10485](https://github.com/matrix-org/synapse/issues/10485))
+- Fix reporting old R30 stats as R30v2 stats. ([\#10486](https://github.com/matrix-org/synapse/issues/10486))
+
+
+Internal Changes
+----------------
+
+- Fix an error which prevented the Github Actions workflow to build the docker images from running. ([\#10461](https://github.com/matrix-org/synapse/issues/10461))
+- Fix release script to correctly version debian changelog when doing RCs. ([\#10465](https://github.com/matrix-org/synapse/issues/10465))
+
+
 Synapse 1.39.0rc2 (2021-07-22)
 ==============================
 
diff --git a/changelog.d/10461.misc b/changelog.d/10461.misc
deleted file mode 100644
index 5035e26825..0000000000
--- a/changelog.d/10461.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix an error which prevented the Github Actions workflow to build the docker images from running.
diff --git a/changelog.d/10465.misc b/changelog.d/10465.misc
deleted file mode 100644
index 4de6201dfc..0000000000
--- a/changelog.d/10465.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix release script to correctly version debian changelog when doing RCs.
diff --git a/changelog.d/10477.bugfix b/changelog.d/10477.bugfix
deleted file mode 100644
index bcc92de434..0000000000
--- a/changelog.d/10477.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug introduced in Synapse 1.38 which caused an exception at startup when SAML authentication was enabled.
diff --git a/changelog.d/10485.bugfix b/changelog.d/10485.bugfix
deleted file mode 100644
index 9b44006dc0..0000000000
--- a/changelog.d/10485.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where Synapse would not inform clients that a device had exhausted its one-time-key pool, potentially causing problems decrypting events.
diff --git a/changelog.d/10486.bugfix b/changelog.d/10486.bugfix
deleted file mode 100644
index 7c65c16e96..0000000000
--- a/changelog.d/10486.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix reporting old R30 stats as R30v2 stats.
diff --git a/debian/changelog b/debian/changelog
index 2062c6caef..4944e55714 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.39.0~rc3) stable; urgency=medium
+
+  * New synapse release 1.39.0~rc3.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 28 Jul 2021 13:30:58 +0100
+
 matrix-synapse-py3 (1.38.1) stable; urgency=medium
 
   * New synapse release 1.38.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 01d6bf17f0..c9a445c8fe 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.39.0rc2"
+__version__ = "1.39.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