From a4921b23703776c9399433906b57c90fadb55bb6 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 8 Jun 2023 13:04:26 +0100
Subject: [PATCH] 1.85.2

---
 CHANGES.md               | 9 +++++++++
 changelog.d/15746.bugfix | 1 -
 debian/changelog         | 6 ++++++
 pyproject.toml           | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/15746.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 5babc22f2..f3eb0182f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.85.2 (2023-06-08)
+===========================
+
+Bugfixes
+--------
+
+- Fix regression where using TLS for replication did not work. Introduced in v1.85.0. ([\#15746](https://github.com/matrix-org/synapse/issues/15746))
+
+
 Synapse 1.85.1 (2023-06-07)
 ===========================
 
diff --git a/changelog.d/15746.bugfix b/changelog.d/15746.bugfix
deleted file mode 100644
index 8d3e22f2e..000000000
--- a/changelog.d/15746.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression where using TLS for replication did not work. Introduced in v1.85.0.
diff --git a/debian/changelog b/debian/changelog
index 6d6f10ddf..a7503ea60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.85.2) stable; urgency=medium
+
+  * New Synapse release 1.85.2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 08 Jun 2023 13:04:18 +0100
+
 matrix-synapse-py3 (1.85.1) stable; urgency=medium
 
   * New Synapse release 1.85.1.
diff --git a/pyproject.toml b/pyproject.toml
index 5b6123dff..02c9255f6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.85.1"
+version = "1.85.2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"