From ff0148a165d8c6405319d177f90b817f14b92040 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Thu, 16 Nov 2023 12:58:00 -0500
Subject: [PATCH] 1.96.0

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

diff --git a/CHANGES.md b/CHANGES.md
index 2e7f199299..23aa629eab 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+# Synapse 1.96.0 (2023-11-16)
+
+### Bugfixes
+
+- Fix "'int' object is not iterable" error in `set_device_id_for_pushers` background update introduced in Synapse 1.95.0. ([\#16594](https://github.com/matrix-org/synapse/issues/16594))
+
+
+
+
 # Synapse 1.96.0rc1 (2023-10-31)
 
 ### Features
diff --git a/changelog.d/16594.bugfix b/changelog.d/16594.bugfix
deleted file mode 100644
index 701fa0dcdc..0000000000
--- a/changelog.d/16594.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix "'int' object is not iterable" error in `set_device_id_for_pushers` background update introduced in Synapse 1.95.0.
diff --git a/debian/changelog b/debian/changelog
index cbfcb8f44d..ab7faa056f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.96.0) stable; urgency=medium
+
+  * New synapse release 1.96.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 16 Nov 2023 17:54:26 +0000
+
 matrix-synapse-py3 (1.96.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.96.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 23e0004395..daf5f5baa2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.96.0rc1"
+version = "1.96.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"