From ccce858c4ad34647ad0e31832c3f61ce635474d6 Mon Sep 17 00:00:00 2001
From: Devon Hudson <devonhudson@librem.one>
Date: Tue, 2 Jul 2024 08:29:34 -0600
Subject: [PATCH] 1.110.0rc3

---
 CHANGES.md               | 14 ++++++++++++++
 changelog.d/17371.misc   |  1 -
 changelog.d/17386.bugfix |  1 -
 changelog.d/17389.misc   |  1 -
 changelog.d/17391.bugfix |  1 -
 debian/changelog         |  6 ++++++
 pyproject.toml           |  2 +-
 7 files changed, 21 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/17371.misc
 delete mode 100644 changelog.d/17386.bugfix
 delete mode 100644 changelog.d/17389.misc
 delete mode 100644 changelog.d/17391.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 94f187b95..cf4f802c7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,17 @@
+# Synapse 1.110.0rc3 (2024-07-02)
+
+### Bugfixes
+
+- Fix bug where `/sync` requests could get blocked indefinitely after an upgrade from Synapse versions before v1.109.0. ([\#17386](https://github.com/element-hq/synapse/issues/17386), [\#17391](https://github.com/element-hq/synapse/issues/17391))
+
+### Internal Changes
+
+- Limit size of presence EDUs to 50 entries. ([\#17371](https://github.com/element-hq/synapse/issues/17371))
+- Fix building debian package for debian sid. ([\#17389](https://github.com/element-hq/synapse/issues/17389))
+
+
+
+
 # Synapse 1.110.0rc2 (2024-06-26)
 
 ### Internal Changes
diff --git a/changelog.d/17371.misc b/changelog.d/17371.misc
deleted file mode 100644
index 0fbf19f4f..000000000
--- a/changelog.d/17371.misc
+++ /dev/null
@@ -1 +0,0 @@
-Limit size of presence EDUs to 50 entries.
diff --git a/changelog.d/17386.bugfix b/changelog.d/17386.bugfix
deleted file mode 100644
index 9686b5c27..000000000
--- a/changelog.d/17386.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where `/sync` requests could get blocked indefinitely after an upgrade from Synapse versions before v1.109.0.
diff --git a/changelog.d/17389.misc b/changelog.d/17389.misc
deleted file mode 100644
index 7022ed93d..000000000
--- a/changelog.d/17389.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix building debian package for debian sid.
diff --git a/changelog.d/17391.bugfix b/changelog.d/17391.bugfix
deleted file mode 100644
index 9686b5c27..000000000
--- a/changelog.d/17391.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where `/sync` requests could get blocked indefinitely after an upgrade from Synapse versions before v1.109.0.
diff --git a/debian/changelog b/debian/changelog
index 59aa84165..d04b0cab0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.110.0~rc3) stable; urgency=medium
+
+  * New Synapse release 1.110.0rc3.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 02 Jul 2024 08:28:56 -0600
+
 matrix-synapse-py3 (1.110.0~rc2) stable; urgency=medium
 
   * New Synapse release 1.110.0rc2.
diff --git a/pyproject.toml b/pyproject.toml
index bbf9c7842..14d16fd77 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.110.0rc2"
+version = "1.110.0rc3"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"