summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md10
-rw-r--r--changelog.d/14301.bugfix1
-rw-r--r--changelog.d/14314.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
5 files changed, 17 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 444d790e80..ce6661fc05 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.70.1 (2022-10-28)
+===========================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.70.0rc1 where access tokens would be incorrectly sent to application services as headers. Application services which were obtaining access tokens from query parameters were not affected. ([\#14301](https://github.com/matrix-org/synapse/issues/14301))
+- Fix room creation being rate limited too aggressively since Synapse v1.69.0. ([\#14314](https://github.com/matrix-org/synapse/issues/14314))
+
+
 Synapse 1.70.0 (2022-10-26)
 ===========================
 
diff --git a/changelog.d/14301.bugfix b/changelog.d/14301.bugfix
deleted file mode 100644
index 668c1f3b9c..0000000000
--- a/changelog.d/14301.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.70.0rc1 where access tokens would be incorrectly sent to application services as headers. Application services which were obtaining access tokens from query parameters were not affected.
diff --git a/changelog.d/14314.bugfix b/changelog.d/14314.bugfix
deleted file mode 100644
index 8be47ee083..0000000000
--- a/changelog.d/14314.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix room creation being rate limited too aggressively since Synapse v1.69.0.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index c3c1cc538a..b9b48e5fbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.70.1) stable; urgency=medium
+
+  * New Synapse release 1.70.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 28 Oct 2022 12:10:21 +0100
+
 matrix-synapse-py3 (1.70.0) stable; urgency=medium
 
   * New Synapse release 1.70.0.
diff --git a/pyproject.toml b/pyproject.toml
index 0e8f6af728..4160809276 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.70.0"
+version = "1.70.1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"