Merge branch 'release-v1.93' into develop

59 files changed, 85 insertions, 57 deletions

diff --git a/CHANGES.md b/CHANGES.md
index b59503e083..eb537f9f6a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,81 @@
+# Synapse 1.93.0rc1 (2023-09-19)
+
+### Features
+
+- Add automatic purge after all users have forgotten a room. ([\#15488](https://github.com/matrix-org/synapse/issues/15488))
+- Restore room purge/shutdown after a Synapse restart. ([\#15488](https://github.com/matrix-org/synapse/issues/15488))
+- Support resolving homeservers using `matrix-fed` DNS SRV records from [MSC4040](https://github.com/matrix-org/matrix-spec-proposals/pull/4040). ([\#16137](https://github.com/matrix-org/synapse/issues/16137))
+- Add the ability to use `G` (GiB) and `T` (TiB) suffixes in configuration options that refer to numbers of bytes. ([\#16219](https://github.com/matrix-org/synapse/issues/16219))
+- Add span information to requests sent to appservices. Contributed by MTRNord. ([\#16227](https://github.com/matrix-org/synapse/issues/16227))
+- Add the ability to enable/disable registrations when using CAS. Contributed by Aurélien Grimpard. ([\#16262](https://github.com/matrix-org/synapse/issues/16262))
+- Allow the `/notifications` endpoint to be routed to workers. ([\#16265](https://github.com/matrix-org/synapse/issues/16265))
+- Enable users to easily unsubscribe to notifications emails via the `List-Unsubscribe` header. ([\#16274](https://github.com/matrix-org/synapse/issues/16274))
+- Report whether a user is `locked` in the [List Accounts admin API](https://matrix-org.github.io/synapse/latest/admin_api/user_admin_api.html#list-accounts), and exclude locked users by default. ([\#16328](https://github.com/matrix-org/synapse/issues/16328))
+
+### Bugfixes
+
+- Fix a long-standing bug where multi-device accounts could cause high load due to presence. ([\#16066](https://github.com/matrix-org/synapse/issues/16066), [\#16170](https://github.com/matrix-org/synapse/issues/16170), [\#16171](https://github.com/matrix-org/synapse/issues/16171), [\#16172](https://github.com/matrix-org/synapse/issues/16172), [\#16174](https://github.com/matrix-org/synapse/issues/16174))
+- Fix a long-standing bug where appservices using [MSC2409](https://github.com/matrix-org/matrix-spec-proposals/pull/2409) to receive `to_device` messages would only get messages for one user. ([\#16251](https://github.com/matrix-org/synapse/issues/16251))
+- Fix bug when using workers where Synapse could end up re-requesting the same remote device repeatedly. ([\#16252](https://github.com/matrix-org/synapse/issues/16252))
+- Fix long-standing bug where we kept re-requesting a remote server's key repeatedly, potentially causing delays in receiving events over federation. ([\#16257](https://github.com/matrix-org/synapse/issues/16257))
+- Avoid temporary storage of sensitive information. ([\#16272](https://github.com/matrix-org/synapse/issues/16272))
+- Fix bug introduced in Synapse 1.49.0 when using dehydrated devices ([MSC2697](https://github.com/matrix-org/matrix-spec-proposals/pull/2697)) and refresh tokens. Contributed by Hanadi. ([\#16288](https://github.com/matrix-org/synapse/issues/16288))
+- Fix a long-standing bug where invalid receipts would be accepted. ([\#16327](https://github.com/matrix-org/synapse/issues/16327))
+- Use standard name for UTF-8 charset in emails. ([\#16329](https://github.com/matrix-org/synapse/issues/16329))
+- Don't try refetching device lists for users on remote hosts that are marked as "down". ([\#16298](https://github.com/matrix-org/synapse/issues/16298))
+
+### Improved Documentation
+
+- Fix typos in the documentation. ([\#16282](https://github.com/matrix-org/synapse/issues/16282))
+- Link to the Alpine Linux community package for Synapse. ([\#16304](https://github.com/matrix-org/synapse/issues/16304))
+- Use string for `federation_client_minimum_tls_version` documentation examples. Contributed by @jcgruenhage. ([\#16353](https://github.com/matrix-org/synapse/issues/16353))
+
+### Internal Changes
+
+- Allow modules to delete rooms. ([\#15997](https://github.com/matrix-org/synapse/issues/15997))
+- Add GCC and GNU Make to the Nix flake development environment so that `ruff` can be compiled. ([\#16090](https://github.com/matrix-org/synapse/issues/16090), [\#16263](https://github.com/matrix-org/synapse/issues/16263))
+- Fix type checking when using the new version of Twisted. ([\#16235](https://github.com/matrix-org/synapse/issues/16235))
+- Delete device messages asynchronously and in staged batches using the task scheduler. ([\#16240](https://github.com/matrix-org/synapse/issues/16240), [\#16311](https://github.com/matrix-org/synapse/issues/16311), [\#16312](https://github.com/matrix-org/synapse/issues/16312), [\#16313](https://github.com/matrix-org/synapse/issues/16313))
+- Bump minimum supported Rust version to 1.61.0. ([\#16248](https://github.com/matrix-org/synapse/issues/16248))
+- Update rust to version 1.71.1 in the nix development environment. ([\#16260](https://github.com/matrix-org/synapse/issues/16260))
+- Simplify server key storage. ([\#16261](https://github.com/matrix-org/synapse/issues/16261))
+- Reduce CPU overhead of change password endpoint. ([\#16264](https://github.com/matrix-org/synapse/issues/16264))
+- Stop purging from tables slated for removal. ([\#16273](https://github.com/matrix-org/synapse/issues/16273))
+- Improve type hints. ([\#16276](https://github.com/matrix-org/synapse/issues/16276), [\#16301](https://github.com/matrix-org/synapse/issues/16301), [\#16325](https://github.com/matrix-org/synapse/issues/16325), [\#16326](https://github.com/matrix-org/synapse/issues/16326))
+- Raise `setuptools_rust` version cap to 1.7.0. ([\#16277](https://github.com/matrix-org/synapse/issues/16277))
+- Fix using the new task scheduler causing lots of CPU to be used. ([\#16278](https://github.com/matrix-org/synapse/issues/16278))
+- Upgrade CI run of Python 3.12 from rc1 to rc2. ([\#16280](https://github.com/matrix-org/synapse/issues/16280))
+- Include values in SQL debug when using `execute_values` with Postgres. ([\#16281](https://github.com/matrix-org/synapse/issues/16281))
+- Enable additional linting checks. ([\#16283](https://github.com/matrix-org/synapse/issues/16283))
+- Refactor `receipts_graph` Postgres transactions to stop error messages. ([\#16299](https://github.com/matrix-org/synapse/issues/16299))
+- Small improvements to logging in replication code. ([\#16309](https://github.com/matrix-org/synapse/issues/16309))
+- Remove a reference cycle in background processes. ([\#16314](https://github.com/matrix-org/synapse/issues/16314))
+- Only use literal strings for background process names. ([\#16315](https://github.com/matrix-org/synapse/issues/16315))
+- Refactor `get_user_by_id`. ([\#16316](https://github.com/matrix-org/synapse/issues/16316))
+- Speed up task to delete to-device messages. ([\#16318](https://github.com/matrix-org/synapse/issues/16318))
+- Avoid patching code in tests. ([\#16349](https://github.com/matrix-org/synapse/issues/16349))
+- Test against PostgreSQL 16. ([\#16351](https://github.com/matrix-org/synapse/issues/16351))
+
+### Updates to locked dependencies
+
+* Bump mypy from 1.4.1 to 1.5.1. ([\#16300](https://github.com/matrix-org/synapse/issues/16300))
+* Bump black from 23.7.0 to 23.9.1. ([\#16295](https://github.com/matrix-org/synapse/issues/16295))
+* Bump docker/build-push-action from 4 to 5. ([\#16336](https://github.com/matrix-org/synapse/issues/16336))
+* Bump docker/login-action from 2 to 3. ([\#16339](https://github.com/matrix-org/synapse/issues/16339))
+* Bump docker/metadata-action from 4 to 5. ([\#16337](https://github.com/matrix-org/synapse/issues/16337))
+* Bump docker/setup-qemu-action from 2 to 3. ([\#16338](https://github.com/matrix-org/synapse/issues/16338))
+* Bump furo from 2023.8.19 to 2023.9.10. ([\#16340](https://github.com/matrix-org/synapse/issues/16340))
+* Bump gitpython from 3.1.32 to 3.1.35. ([\#16267](https://github.com/matrix-org/synapse/issues/16267), [\#16279](https://github.com/matrix-org/synapse/issues/16279))
+* Bump mypy-zope from 1.0.0 to 1.0.1. ([\#16291](https://github.com/matrix-org/synapse/issues/16291))
+* Bump pillow from 10.0.0 to 10.0.1. ([\#16344](https://github.com/matrix-org/synapse/issues/16344))
+* Bump regex from 1.9.4 to 1.9.5. ([\#16233](https://github.com/matrix-org/synapse/issues/16233))
+* Bump ruff from 0.0.286 to 0.0.290. ([\#16342](https://github.com/matrix-org/synapse/issues/16342))
+* Bump serde_json from 1.0.105 to 1.0.107. ([\#16296](https://github.com/matrix-org/synapse/issues/16296), [\#16345](https://github.com/matrix-org/synapse/issues/16345))
+* Bump twisted from 22.10.0 to 23.8.0. ([\#16235](https://github.com/matrix-org/synapse/issues/16235))
+* Bump types-pillow from 10.0.0.2 to 10.0.0.3. ([\#16293](https://github.com/matrix-org/synapse/issues/16293))
+* Bump types-setuptools from 68.0.0.3 to 68.2.0.0. ([\#16292](https://github.com/matrix-org/synapse/issues/16292))
+* Bump typing-extensions from 4.7.1 to 4.8.0. ([\#16341](https://github.com/matrix-org/synapse/issues/16341))
+
 # Synapse 1.92.3 (2023-09-18)
 
 This is again a security update targeted at mitigating [CVE-2023-4863](https://cve.org/CVERecord?id=CVE-2023-4863).
diff --git a/changelog.d/15488.feature b/changelog.d/15488.feature
deleted file mode 100644
index 8684d84192..0000000000
--- a/changelog.d/15488.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add automatic purge after all users forgotten a room. Also add restore of purge/shutdown rooms after a synapse restart.
diff --git a/changelog.d/15997.misc b/changelog.d/15997.misc
deleted file mode 100644
index 94768c3cb8..0000000000
--- a/changelog.d/15997.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow modules to delete rooms.
\ No newline at end of file
diff --git a/changelog.d/16066.bugfix b/changelog.d/16066.bugfix
deleted file mode 100644
index 83649cf42a..0000000000
--- a/changelog.d/16066.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where multi-device accounts could cause high load due to presence.
diff --git a/changelog.d/16090.misc b/changelog.d/16090.misc
deleted file mode 100644
index d54ef936c7..0000000000
--- a/changelog.d/16090.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add GCC and GNU Make to the Nix flake development environment so that `ruff` can be compiled.
\ No newline at end of file
diff --git a/changelog.d/16137.feature b/changelog.d/16137.feature
deleted file mode 100644
index bba6f161cd..0000000000
--- a/changelog.d/16137.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support resolving homeservers using `matrix-fed` DNS SRV records from [MSC4040](https://github.com/matrix-org/matrix-spec-proposals/pull/4040).
diff --git a/changelog.d/16170.bugfix b/changelog.d/16170.bugfix
deleted file mode 100644
index 83649cf42a..0000000000
--- a/changelog.d/16170.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where multi-device accounts could cause high load due to presence.
diff --git a/changelog.d/16171.bugfix b/changelog.d/16171.bugfix
deleted file mode 100644
index 83649cf42a..0000000000
--- a/changelog.d/16171.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where multi-device accounts could cause high load due to presence.
diff --git a/changelog.d/16172.bugfix b/changelog.d/16172.bugfix
deleted file mode 100644
index 83649cf42a..0000000000
--- a/changelog.d/16172.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where multi-device accounts could cause high load due to presence.
diff --git a/changelog.d/16174.bugfix b/changelog.d/16174.bugfix
deleted file mode 100644
index 83649cf42a..0000000000
--- a/changelog.d/16174.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where multi-device accounts could cause high load due to presence.
diff --git a/changelog.d/16219.feature b/changelog.d/16219.feature
deleted file mode 100644
index c789f2abb7..0000000000
--- a/changelog.d/16219.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add the ability to use `G` (GiB) and `T` (TiB) suffixes in configuration options that refer to numbers of bytes.
\ No newline at end of file
diff --git a/changelog.d/16227.feature b/changelog.d/16227.feature
deleted file mode 100644
index 510062b622..0000000000
--- a/changelog.d/16227.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add span information to requests sent to appservices. Contributed by MTRNord.
\ No newline at end of file
diff --git a/changelog.d/16235.misc b/changelog.d/16235.misc
deleted file mode 100644
index b1533f93b6..0000000000
--- a/changelog.d/16235.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix type checking when using the new version of Twisted.
diff --git a/changelog.d/16240.misc b/changelog.d/16240.misc
deleted file mode 100644
index 4f266c1fb0..0000000000
--- a/changelog.d/16240.misc
+++ /dev/null
@@ -1 +0,0 @@
-Delete device messages asynchronously and in staged batches using the task scheduler.
diff --git a/changelog.d/16248.misc b/changelog.d/16248.misc
deleted file mode 100644
index 0a5ed6dccb..0000000000
--- a/changelog.d/16248.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump minimum supported Rust version to 1.61.0.
diff --git a/changelog.d/16251.bugfix b/changelog.d/16251.bugfix
deleted file mode 100644
index 6d3157c7aa..0000000000
--- a/changelog.d/16251.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where appservices using MSC2409 to receive to_device messages, would only get messages for one user.
\ No newline at end of file
diff --git a/changelog.d/16252.bugfix b/changelog.d/16252.bugfix
deleted file mode 100644
index 881bc00e61..0000000000
--- a/changelog.d/16252.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug when using workers where Synapse could end up re-requesting the same remote device repeatedly.
diff --git a/changelog.d/16257.bugfix b/changelog.d/16257.bugfix
deleted file mode 100644
index 28a5319749..0000000000
--- a/changelog.d/16257.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix long-standing bug where we kept re-requesting a remote server's key repeatedly, potentially causing delays in receiving events over federation.
diff --git a/changelog.d/16260.misc b/changelog.d/16260.misc
deleted file mode 100644
index 9f3289d7d4..0000000000
--- a/changelog.d/16260.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update rust to version 1.71.1 in the nix development environment.
\ No newline at end of file
diff --git a/changelog.d/16261.misc b/changelog.d/16261.misc
deleted file mode 100644
index d3ad59ca4a..0000000000
--- a/changelog.d/16261.misc
+++ /dev/null
@@ -1 +0,0 @@
-Simplify server key storage.
diff --git a/changelog.d/16262.feature b/changelog.d/16262.feature
deleted file mode 100644
index 7c8e7e349b..0000000000
--- a/changelog.d/16262.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add the ability to enable/disable registrations when in the CAS flow. Contributed by Aurélien Grimpard.
diff --git a/changelog.d/16263.misc b/changelog.d/16263.misc
deleted file mode 100644
index d54ef936c7..0000000000
--- a/changelog.d/16263.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add GCC and GNU Make to the Nix flake development environment so that `ruff` can be compiled.
\ No newline at end of file
diff --git a/changelog.d/16264.misc b/changelog.d/16264.misc
deleted file mode 100644
index a744434bef..0000000000
--- a/changelog.d/16264.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce CPU overhead of change password endpoint.
diff --git a/changelog.d/16265.feature b/changelog.d/16265.feature
deleted file mode 100644
index 3ffa16dbcb..0000000000
--- a/changelog.d/16265.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow `/notifications` endpoint to be routed to workers.
diff --git a/changelog.d/16272.bugfix b/changelog.d/16272.bugfix
deleted file mode 100644
index afb22a999f..0000000000
--- a/changelog.d/16272.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid temporary storage of sensitive information.
diff --git a/changelog.d/16273.misc b/changelog.d/16273.misc
deleted file mode 100644
index 19882f6754..0000000000
--- a/changelog.d/16273.misc
+++ /dev/null
@@ -1 +0,0 @@
-Stop purging from tables slated for removal.
diff --git a/changelog.d/16274.feature b/changelog.d/16274.feature
deleted file mode 100644
index 0d9da2bbef..0000000000
--- a/changelog.d/16274.feature
+++ /dev/null
@@ -1 +0,0 @@
-Enable users to easily unsubscribe to notifications emails via the `List-Unsubscribe` header.
diff --git a/changelog.d/16276.misc b/changelog.d/16276.misc
deleted file mode 100644
index 93ceaeafc9..0000000000
--- a/changelog.d/16276.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve type hints.
diff --git a/changelog.d/16277.misc b/changelog.d/16277.misc
deleted file mode 100644
index c131a46ec3..0000000000
--- a/changelog.d/16277.misc
+++ /dev/null
@@ -1 +0,0 @@
-Raise setuptools_rust version cap to 1.7.0.
diff --git a/changelog.d/16278.misc b/changelog.d/16278.misc
deleted file mode 100644
index e82a470c45..0000000000
--- a/changelog.d/16278.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix using the new task scheduler causing lots of CPU to be used.
diff --git a/changelog.d/16280.misc b/changelog.d/16280.misc
deleted file mode 100644
index 2d8b414a3b..0000000000
--- a/changelog.d/16280.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade CI run of Python 3.12 from rc1 to rc2.
diff --git a/changelog.d/16281.misc b/changelog.d/16281.misc
deleted file mode 100644
index de48396aff..0000000000
--- a/changelog.d/16281.misc
+++ /dev/null
@@ -1 +0,0 @@
-Include values in SQL debug when using `execute_values` with Postgres.
diff --git a/changelog.d/16282.doc b/changelog.d/16282.doc
deleted file mode 100644
index b249ea4f9f..0000000000
--- a/changelog.d/16282.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix typos in the documentation.
diff --git a/changelog.d/16283.misc b/changelog.d/16283.misc
deleted file mode 100644
index 4b9d6f76ae..0000000000
--- a/changelog.d/16283.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable additional linting checks.
diff --git a/changelog.d/16288.bugfix b/changelog.d/16288.bugfix
deleted file mode 100644
index f08d10d1f3..0000000000
--- a/changelog.d/16288.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug introduced in Synapse 1.49.0 when using dehydrated devices ([MSC2697](https://github.com/matrix-org/matrix-spec-proposals/pull/2697)) and refresh tokens. Contributed by Hanadi.
diff --git a/changelog.d/16298.misc b/changelog.d/16298.misc
deleted file mode 100644
index 75b546d424..0000000000
--- a/changelog.d/16298.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't try refetching device lists for users on remote hosts that are marked as "down".
diff --git a/changelog.d/16299.misc b/changelog.d/16299.misc
deleted file mode 100644
index d454669151..0000000000
--- a/changelog.d/16299.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `receipts_graph` Postgres transactions to stop error messages.
diff --git a/changelog.d/16300.misc b/changelog.d/16300.misc
deleted file mode 100644
index 8cc2e52369..0000000000
--- a/changelog.d/16300.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump mypy from 1.4.1 to 1.5.1.
diff --git a/changelog.d/16301.misc b/changelog.d/16301.misc
deleted file mode 100644
index 93ceaeafc9..0000000000
--- a/changelog.d/16301.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve type hints.
diff --git a/changelog.d/16304.doc b/changelog.d/16304.doc
deleted file mode 100644
index 53660ec9a4..0000000000
--- a/changelog.d/16304.doc
+++ /dev/null
@@ -1 +0,0 @@
-Link to the Alpine Linux community package for Synapse.
diff --git a/changelog.d/16309.misc b/changelog.d/16309.misc
deleted file mode 100644
index bef5563ee9..0000000000
--- a/changelog.d/16309.misc
+++ /dev/null
@@ -1 +0,0 @@
-Small improvements to logging in replication code.
diff --git a/changelog.d/16311.misc b/changelog.d/16311.misc
deleted file mode 100644
index 4f266c1fb0..0000000000
--- a/changelog.d/16311.misc
+++ /dev/null
@@ -1 +0,0 @@
-Delete device messages asynchronously and in staged batches using the task scheduler.
diff --git a/changelog.d/16312.misc b/changelog.d/16312.misc
deleted file mode 100644
index 4f266c1fb0..0000000000
--- a/changelog.d/16312.misc
+++ /dev/null
@@ -1 +0,0 @@
-Delete device messages asynchronously and in staged batches using the task scheduler.
diff --git a/changelog.d/16313.misc b/changelog.d/16313.misc
deleted file mode 100644
index 4f266c1fb0..0000000000
--- a/changelog.d/16313.misc
+++ /dev/null
@@ -1 +0,0 @@
-Delete device messages asynchronously and in staged batches using the task scheduler.
diff --git a/changelog.d/16314.misc b/changelog.d/16314.misc
deleted file mode 100644
index a32b07112a..0000000000
--- a/changelog.d/16314.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove a reference cycle for in background processes.
diff --git a/changelog.d/16315.misc b/changelog.d/16315.misc
deleted file mode 100644
index d88782c979..0000000000
--- a/changelog.d/16315.misc
+++ /dev/null
@@ -1 +0,0 @@
-Only use literal strings for background process names.
diff --git a/changelog.d/16316.misc b/changelog.d/16316.misc
deleted file mode 100644
index aa0644f278..0000000000
--- a/changelog.d/16316.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `get_user_by_id`.
diff --git a/changelog.d/16318.misc b/changelog.d/16318.misc
deleted file mode 100644
index 1433a2f246..0000000000
--- a/changelog.d/16318.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up task to delete to-device messages.
diff --git a/changelog.d/16325.misc b/changelog.d/16325.misc
deleted file mode 100644
index 93ceaeafc9..0000000000
--- a/changelog.d/16325.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve type hints.
diff --git a/changelog.d/16326.misc b/changelog.d/16326.misc
deleted file mode 100644
index 93ceaeafc9..0000000000
--- a/changelog.d/16326.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve type hints.
diff --git a/changelog.d/16327.bugfix b/changelog.d/16327.bugfix
deleted file mode 100644
index be3d1b4f21..0000000000
--- a/changelog.d/16327.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where invalid receipts would be accepted.
diff --git a/changelog.d/16328.feature b/changelog.d/16328.feature
deleted file mode 100644
index 9fadf766cc..0000000000
--- a/changelog.d/16328.feature
+++ /dev/null
@@ -1 +0,0 @@
-Report whether a user is `locked` in the [List Accounts admin API](https://matrix-org.github.io/synapse/latest/admin_api/user_admin_api.html#list-accounts), and exclude locked users by default.
diff --git a/changelog.d/16329.bugfix b/changelog.d/16329.bugfix
deleted file mode 100644
index 2f1f7e8ffe..0000000000
--- a/changelog.d/16329.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Use standard name for UTF-8 charset in emails.
diff --git a/changelog.d/16347.misc b/changelog.d/16347.misc
deleted file mode 100644
index f4f5bfb2de..0000000000
--- a/changelog.d/16347.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pillow 10.0.1 is now mandatory because of libwebp CVE-2023-4863, since Pillow provides libwebp in the wheels.
diff --git a/changelog.d/16349.misc b/changelog.d/16349.misc
deleted file mode 100644
index 8ce27a1599..0000000000
--- a/changelog.d/16349.misc
+++ /dev/null
@@ -1 +0,0 @@
-Avoid patching code in tests.
diff --git a/changelog.d/16351.misc b/changelog.d/16351.misc
deleted file mode 100644
index b955b3da08..0000000000
--- a/changelog.d/16351.misc
+++ /dev/null
@@ -1 +0,0 @@
-Test against PostgreSQL 16.
diff --git a/changelog.d/16353.doc b/changelog.d/16353.doc
deleted file mode 100644
index 80af22ed53..0000000000
--- a/changelog.d/16353.doc
+++ /dev/null
@@ -1 +0,0 @@
-Use string for federation_client_minimum_tls_version documentation examples. Contributed by @jcgruenhage.
diff --git a/debian/changelog b/debian/changelog
index 254ca26fd8..192eedd45c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.93.0~rc1) stable; urgency=medium
+
+  * New synapse release 1.93.0rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 19 Sep 2023 11:55:00 +0000
+
 matrix-synapse-py3 (1.92.3) stable; urgency=medium
 
   * New Synapse release 1.92.3.
diff --git a/pyproject.toml b/pyproject.toml
index de4dd61ea5..f69336a73f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -95,7 +95,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.92.3"
+version = "1.93.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"