From 8df9941cc2462bc8e99ebd02953c5090f4942463 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Tue, 8 Jun 2021 14:09:00 +0100
Subject: [PATCH] 1.36.0rc1

---
 CHANGES.md                | 68 +++++++++++++++++++++++++++++++++++++++
 changelog.d/10013.misc    |  1 -
 changelog.d/10035.feature |  1 -
 changelog.d/10040.feature |  1 -
 changelog.d/10044.feature |  1 -
 changelog.d/10046.doc     |  1 -
 changelog.d/10048.misc    |  1 -
 changelog.d/10054.misc    |  1 -
 changelog.d/10055.misc    |  1 -
 changelog.d/10057.doc     |  1 -
 changelog.d/10059.misc    |  1 -
 changelog.d/10063.removal |  1 -
 changelog.d/10069.misc    |  1 -
 changelog.d/10074.misc    |  1 -
 changelog.d/10077.feature |  1 -
 changelog.d/10078.misc    |  1 -
 changelog.d/10082.bugfix  |  1 -
 changelog.d/10084.feature |  1 -
 changelog.d/10086.doc     |  1 -
 changelog.d/10089.doc     |  1 -
 changelog.d/10091.misc    |  1 -
 changelog.d/10092.bugfix  |  1 -
 changelog.d/10094.misc    |  1 -
 changelog.d/10102.misc    |  1 -
 changelog.d/10105.misc    |  1 -
 changelog.d/10107.bugfix  |  1 -
 changelog.d/10111.misc    |  1 -
 changelog.d/10112.misc    |  1 -
 changelog.d/10113.feature |  1 -
 changelog.d/10116.bugfix  |  1 -
 changelog.d/10117.feature |  1 -
 changelog.d/10118.bugfix  |  1 -
 changelog.d/10124.misc    |  1 -
 changelog.d/10130.doc     |  1 -
 changelog.d/10132.doc     |  1 -
 changelog.d/10133.bugfix  |  1 -
 changelog.d/10135.misc    |  1 -
 changelog.d/10136.feature |  1 -
 changelog.d/10137.misc    |  1 -
 changelog.d/10141.feature |  1 -
 changelog.d/9221.doc      |  1 -
 changelog.d/9224.feature  |  1 -
 changelog.d/9906.misc     |  1 -
 changelog.d/9953.feature  |  1 -
 changelog.d/9973.feature  |  1 -
 synapse/__init__.py       |  2 +-
 46 files changed, 69 insertions(+), 45 deletions(-)
 delete mode 100644 changelog.d/10013.misc
 delete mode 100644 changelog.d/10035.feature
 delete mode 100644 changelog.d/10040.feature
 delete mode 100644 changelog.d/10044.feature
 delete mode 100644 changelog.d/10046.doc
 delete mode 100644 changelog.d/10048.misc
 delete mode 100644 changelog.d/10054.misc
 delete mode 100644 changelog.d/10055.misc
 delete mode 100644 changelog.d/10057.doc
 delete mode 100644 changelog.d/10059.misc
 delete mode 100644 changelog.d/10063.removal
 delete mode 100644 changelog.d/10069.misc
 delete mode 100644 changelog.d/10074.misc
 delete mode 100644 changelog.d/10077.feature
 delete mode 100644 changelog.d/10078.misc
 delete mode 100644 changelog.d/10082.bugfix
 delete mode 100644 changelog.d/10084.feature
 delete mode 100644 changelog.d/10086.doc
 delete mode 100644 changelog.d/10089.doc
 delete mode 100644 changelog.d/10091.misc
 delete mode 100644 changelog.d/10092.bugfix
 delete mode 100644 changelog.d/10094.misc
 delete mode 100644 changelog.d/10102.misc
 delete mode 100644 changelog.d/10105.misc
 delete mode 100644 changelog.d/10107.bugfix
 delete mode 100644 changelog.d/10111.misc
 delete mode 100644 changelog.d/10112.misc
 delete mode 100644 changelog.d/10113.feature
 delete mode 100644 changelog.d/10116.bugfix
 delete mode 100644 changelog.d/10117.feature
 delete mode 100644 changelog.d/10118.bugfix
 delete mode 100644 changelog.d/10124.misc
 delete mode 100644 changelog.d/10130.doc
 delete mode 100644 changelog.d/10132.doc
 delete mode 100644 changelog.d/10133.bugfix
 delete mode 100644 changelog.d/10135.misc
 delete mode 100644 changelog.d/10136.feature
 delete mode 100644 changelog.d/10137.misc
 delete mode 100644 changelog.d/10141.feature
 delete mode 100644 changelog.d/9221.doc
 delete mode 100644 changelog.d/9224.feature
 delete mode 100644 changelog.d/9906.misc
 delete mode 100644 changelog.d/9953.feature
 delete mode 100644 changelog.d/9973.feature

diff --git a/CHANGES.md b/CHANGES.md
index 04d260f8e..69c876e38 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,71 @@
+Synapse 1.36.0rc1 (2021-06-08)
+==============================
+
+Features
+--------
+
+- Add new endpoint `/_matrix/client/r0/rooms/{roomId}/aliases` from Client-Server API r0.6.1 (previously [MSC2432](https://github.com/matrix-org/matrix-doc/pull/2432)). ([\#9224](https://github.com/matrix-org/synapse/issues/9224))
+- Improve performance of incoming federation transactions in large rooms. ([\#9953](https://github.com/matrix-org/synapse/issues/9953), [\#9973](https://github.com/matrix-org/synapse/issues/9973))
+- Rewrite logic around verifying JSON object and fetching server keys to be more performant and use less memory. ([\#10035](https://github.com/matrix-org/synapse/issues/10035))
+- Add an admin API for unprotecting local media from quarantine. Contributed by @dklimpel. ([\#10040](https://github.com/matrix-org/synapse/issues/10040))
+- Add new admin APIs to remove media by media ID from quarantine. Contributed by @dkimpel. ([\#10044](https://github.com/matrix-org/synapse/issues/10044))
+- Make reason and score parameters optional for reporting content. Implements [MSC2414](https://github.com/matrix-org/matrix-doc/pull/2414). Contributed by Callum Brown. ([\#10077](https://github.com/matrix-org/synapse/issues/10077))
+- Add support for routing more requests to workers. ([\#10084](https://github.com/matrix-org/synapse/issues/10084))
+- Report OpenTracing spans for database activity. ([\#10113](https://github.com/matrix-org/synapse/issues/10113), [\#10136](https://github.com/matrix-org/synapse/issues/10136), [\#10141](https://github.com/matrix-org/synapse/issues/10141))
+- Significantly reduce memory usage of joining large remote rooms. ([\#10117](https://github.com/matrix-org/synapse/issues/10117))
+
+
+Bugfixes
+--------
+
+- Fixed a bug causing replication requests to fail when receiving a lot of events via federation. ([\#10082](https://github.com/matrix-org/synapse/issues/10082))
+- Fix a bug in the `force_tracing_for_users` option introduced in Synapse v1.35 which meant that the OpenTracing spans produced were missing most tags. ([\#10092](https://github.com/matrix-org/synapse/issues/10092))
+- Fixed a bug that could cause Synapse to stop notifying application services. Contributed by Willem Mulder. ([\#10107](https://github.com/matrix-org/synapse/issues/10107))
+- Fix bug where the server would attempt to fetch the same history in the room from a remote server multiple times in parallel. ([\#10116](https://github.com/matrix-org/synapse/issues/10116))
+- Fix a bug introduced in Synapse 1.33.0 which caused replication requests to fail when receiving a lot of very large events via federation. ([\#10118](https://github.com/matrix-org/synapse/issues/10118))
+- Fix bug when using workers where pagination requests failed if a remote server returned zero events from `/backfill`. Introduced in 1.35.0. ([\#10133](https://github.com/matrix-org/synapse/issues/10133))
+
+
+Improved Documentation
+----------------------
+
+- Clarify security note regarding hosting Synapse on the same domain as other web applications. ([\#9221](https://github.com/matrix-org/synapse/issues/9221))
+- Update CAPTCHA documentation to mention turning off the verify origin feature. Contributed by @aaronraimist. ([\#10046](https://github.com/matrix-org/synapse/issues/10046))
+- Tweak wording of database recommendation in `INSTALL.md`. Contributed by @aaronraimist. ([\#10057](https://github.com/matrix-org/synapse/issues/10057))
+- Add initial infrastructure for rendering Synapse documentation with mdbook. ([\#10086](https://github.com/matrix-org/synapse/issues/10086))
+- Convert the remaining Admin API documentation files to markdown. ([\#10089](https://github.com/matrix-org/synapse/issues/10089))
+- Make a link in docs use HTTPS. Contributed by @RhnSharma. ([\#10130](https://github.com/matrix-org/synapse/issues/10130))
+- Fix broken link in Docker docs. ([\#10132](https://github.com/matrix-org/synapse/issues/10132))
+
+
+Deprecations and Removals
+-------------------------
+
+- Remove the experimental `spaces_enabled` flag. The spaces features are always available now. ([\#10063](https://github.com/matrix-org/synapse/issues/10063))
+
+
+Internal Changes
+----------------
+
+- Tell CircleCI to build Docker images from `main` branch. ([\#9906](https://github.com/matrix-org/synapse/issues/9906))
+- Simplify naming convention for release branches to only include the major and minor version numbers. ([\#10013](https://github.com/matrix-org/synapse/issues/10013))
+- Add `parse_strings_from_args` for parsing an array from query parameters. ([\#10048](https://github.com/matrix-org/synapse/issues/10048), [\#10137](https://github.com/matrix-org/synapse/issues/10137))
+- Remove some dead code regarding TLS certificate handling. ([\#10054](https://github.com/matrix-org/synapse/issues/10054))
+- Remove redundant, unmaintained `convert_server_keys` script. ([\#10055](https://github.com/matrix-org/synapse/issues/10055))
+- Improve the error message printed by synctl when synapse fails to start. ([\#10059](https://github.com/matrix-org/synapse/issues/10059))
+- Fix GitHub Actions lint for newsfragments. ([\#10069](https://github.com/matrix-org/synapse/issues/10069))
+- Update opentracing to inject the right context into the carrier. ([\#10074](https://github.com/matrix-org/synapse/issues/10074))
+- Fix up `BatchingQueue` implementation. ([\#10078](https://github.com/matrix-org/synapse/issues/10078))
+- Log method and path when dropping request due to size limit. ([\#10091](https://github.com/matrix-org/synapse/issues/10091))
+- In Github Actions workflows, summarize the Sytest results in an easy-to-read format. ([\#10094](https://github.com/matrix-org/synapse/issues/10094))
+- Make `/sync` do fewer state resolutions. ([\#10102](https://github.com/matrix-org/synapse/issues/10102))
+- Add missing type hints to the admin API servlets. ([\#10105](https://github.com/matrix-org/synapse/issues/10105))
+- Improve opentracing annotations for `Notifier`. ([\#10111](https://github.com/matrix-org/synapse/issues/10111))
+- Enable Prometheus metrics for the jaeger client library. ([\#10112](https://github.com/matrix-org/synapse/issues/10112))
+- Work to improve the responsiveness of `/sync` requests. ([\#10124](https://github.com/matrix-org/synapse/issues/10124))
+- OpenTracing: use a consistent name for background processes. ([\#10135](https://github.com/matrix-org/synapse/issues/10135))
+
+
 Synapse 1.35.1 (2021-06-03)
 ===========================
 
diff --git a/changelog.d/10013.misc b/changelog.d/10013.misc
deleted file mode 100644
index 9d164d9ce..000000000
--- a/changelog.d/10013.misc
+++ /dev/null
@@ -1 +0,0 @@
-Simplify naming convention for release branches to only include the major and minor version numbers.
diff --git a/changelog.d/10035.feature b/changelog.d/10035.feature
deleted file mode 100644
index 68052b5a7..000000000
--- a/changelog.d/10035.feature
+++ /dev/null
@@ -1 +0,0 @@
-Rewrite logic around verifying JSON object and fetching server keys to be more performant and use less memory.
diff --git a/changelog.d/10040.feature b/changelog.d/10040.feature
deleted file mode 100644
index ec78a30f0..000000000
--- a/changelog.d/10040.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add an admin API for unprotecting local media from quarantine. Contributed by @dklimpel.
diff --git a/changelog.d/10044.feature b/changelog.d/10044.feature
deleted file mode 100644
index 70c0a3851..000000000
--- a/changelog.d/10044.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new admin APIs to remove media by media ID from quarantine. Contributed by @dkimpel.
diff --git a/changelog.d/10046.doc b/changelog.d/10046.doc
deleted file mode 100644
index 995960163..000000000
--- a/changelog.d/10046.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update CAPTCHA documentation to mention turning off the verify origin feature. Contributed by @aaronraimist.
diff --git a/changelog.d/10048.misc b/changelog.d/10048.misc
deleted file mode 100644
index a901f8431..000000000
--- a/changelog.d/10048.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add `parse_strings_from_args` for parsing an array from query parameters.
diff --git a/changelog.d/10054.misc b/changelog.d/10054.misc
deleted file mode 100644
index cebe39ce5..000000000
--- a/changelog.d/10054.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove some dead code regarding TLS certificate handling.
diff --git a/changelog.d/10055.misc b/changelog.d/10055.misc
deleted file mode 100644
index da84a2dde..000000000
--- a/changelog.d/10055.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove redundant, unmaintained `convert_server_keys` script.
diff --git a/changelog.d/10057.doc b/changelog.d/10057.doc
deleted file mode 100644
index 35437cb01..000000000
--- a/changelog.d/10057.doc
+++ /dev/null
@@ -1 +0,0 @@
-Tweak wording of database recommendation in `INSTALL.md`. Contributed by @aaronraimist.
\ No newline at end of file
diff --git a/changelog.d/10059.misc b/changelog.d/10059.misc
deleted file mode 100644
index ca6e0e8a5..000000000
--- a/changelog.d/10059.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the error message printed by synctl when synapse fails to start.
diff --git a/changelog.d/10063.removal b/changelog.d/10063.removal
deleted file mode 100644
index 0f8889b6b..000000000
--- a/changelog.d/10063.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove the experimental `spaces_enabled` flag. The spaces features are always available now.
diff --git a/changelog.d/10069.misc b/changelog.d/10069.misc
deleted file mode 100644
index a8d2629e9..000000000
--- a/changelog.d/10069.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix GitHub Actions lint for newsfragments.
diff --git a/changelog.d/10074.misc b/changelog.d/10074.misc
deleted file mode 100644
index 8dbe2cd2b..000000000
--- a/changelog.d/10074.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update opentracing to inject the right context into the carrier.
diff --git a/changelog.d/10077.feature b/changelog.d/10077.feature
deleted file mode 100644
index 808feb221..000000000
--- a/changelog.d/10077.feature
+++ /dev/null
@@ -1 +0,0 @@
-Make reason and score parameters optional for reporting content. Implements [MSC2414](https://github.com/matrix-org/matrix-doc/pull/2414). Contributed by Callum Brown.
diff --git a/changelog.d/10078.misc b/changelog.d/10078.misc
deleted file mode 100644
index a4b089d0f..000000000
--- a/changelog.d/10078.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix up `BatchingQueue` implementation.
diff --git a/changelog.d/10082.bugfix b/changelog.d/10082.bugfix
deleted file mode 100644
index b4f8bcc4f..000000000
--- a/changelog.d/10082.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug causing replication requests to fail when receiving a lot of events via federation.
diff --git a/changelog.d/10084.feature b/changelog.d/10084.feature
deleted file mode 100644
index 602cb6ff5..000000000
--- a/changelog.d/10084.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for routing more requests to workers.
diff --git a/changelog.d/10086.doc b/changelog.d/10086.doc
deleted file mode 100644
index 220057901..000000000
--- a/changelog.d/10086.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add initial infrastructure for rendering Synapse documentation with mdbook.
diff --git a/changelog.d/10089.doc b/changelog.d/10089.doc
deleted file mode 100644
index d9e93773a..000000000
--- a/changelog.d/10089.doc
+++ /dev/null
@@ -1 +0,0 @@
-Convert the remaining Admin API documentation files to markdown.
diff --git a/changelog.d/10091.misc b/changelog.d/10091.misc
deleted file mode 100644
index dbe310fd1..000000000
--- a/changelog.d/10091.misc
+++ /dev/null
@@ -1 +0,0 @@
-Log method and path when dropping request due to size limit.
diff --git a/changelog.d/10092.bugfix b/changelog.d/10092.bugfix
deleted file mode 100644
index 09b2aba7f..000000000
--- a/changelog.d/10092.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug in the `force_tracing_for_users` option introduced in Synapse v1.35 which meant that the OpenTracing spans produced were missing most tags.
diff --git a/changelog.d/10094.misc b/changelog.d/10094.misc
deleted file mode 100644
index 01efe14f7..000000000
--- a/changelog.d/10094.misc
+++ /dev/null
@@ -1 +0,0 @@
-In Github Actions workflows, summarize the Sytest results in an easy-to-read format.
diff --git a/changelog.d/10102.misc b/changelog.d/10102.misc
deleted file mode 100644
index 87672ee29..000000000
--- a/changelog.d/10102.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make `/sync` do fewer state resolutions.
diff --git a/changelog.d/10105.misc b/changelog.d/10105.misc
deleted file mode 100644
index 244a893d3..000000000
--- a/changelog.d/10105.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints to the admin API servlets.
\ No newline at end of file
diff --git a/changelog.d/10107.bugfix b/changelog.d/10107.bugfix
deleted file mode 100644
index 80030efab..000000000
--- a/changelog.d/10107.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug that could cause Synapse to stop notifying application services. Contributed by Willem Mulder.
diff --git a/changelog.d/10111.misc b/changelog.d/10111.misc
deleted file mode 100644
index 42e42b69a..000000000
--- a/changelog.d/10111.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve opentracing annotations for `Notifier`.
diff --git a/changelog.d/10112.misc b/changelog.d/10112.misc
deleted file mode 100644
index 40af09760..000000000
--- a/changelog.d/10112.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable Prometheus metrics for the jaeger client library.
diff --git a/changelog.d/10113.feature b/changelog.d/10113.feature
deleted file mode 100644
index 2658ab891..000000000
--- a/changelog.d/10113.feature
+++ /dev/null
@@ -1 +0,0 @@
-Report OpenTracing spans for database activity.
diff --git a/changelog.d/10116.bugfix b/changelog.d/10116.bugfix
deleted file mode 100644
index 90ef70755..000000000
--- a/changelog.d/10116.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where the server would attempt to fetch the same history in the room from a remote server multiple times in parallel.
diff --git a/changelog.d/10117.feature b/changelog.d/10117.feature
deleted file mode 100644
index e137e142c..000000000
--- a/changelog.d/10117.feature
+++ /dev/null
@@ -1 +0,0 @@
-Significantly reduce memory usage of joining large remote rooms.
diff --git a/changelog.d/10118.bugfix b/changelog.d/10118.bugfix
deleted file mode 100644
index db62b50e0..000000000
--- a/changelog.d/10118.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.33.0 which caused replication requests to fail when receiving a lot of very large events via federation.
diff --git a/changelog.d/10124.misc b/changelog.d/10124.misc
deleted file mode 100644
index c06593238..000000000
--- a/changelog.d/10124.misc
+++ /dev/null
@@ -1 +0,0 @@
-Work to improve the responsiveness of `/sync` requests.
diff --git a/changelog.d/10130.doc b/changelog.d/10130.doc
deleted file mode 100644
index 42ed1f3ea..000000000
--- a/changelog.d/10130.doc
+++ /dev/null
@@ -1 +0,0 @@
-Make a link in docs use HTTPS. Contributed by @RhnSharma.
diff --git a/changelog.d/10132.doc b/changelog.d/10132.doc
deleted file mode 100644
index 70f538f07..000000000
--- a/changelog.d/10132.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken link in Docker docs.
diff --git a/changelog.d/10133.bugfix b/changelog.d/10133.bugfix
deleted file mode 100644
index a62c15b26..000000000
--- a/changelog.d/10133.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug when using workers where pagination requests failed if a remote server returned zero events from `/backfill`. Introduced in 1.35.0.
diff --git a/changelog.d/10135.misc b/changelog.d/10135.misc
deleted file mode 100644
index 17819cbbc..000000000
--- a/changelog.d/10135.misc
+++ /dev/null
@@ -1 +0,0 @@
-OpenTracing: use a consistent name for background processes.
diff --git a/changelog.d/10136.feature b/changelog.d/10136.feature
deleted file mode 100644
index 2658ab891..000000000
--- a/changelog.d/10136.feature
+++ /dev/null
@@ -1 +0,0 @@
-Report OpenTracing spans for database activity.
diff --git a/changelog.d/10137.misc b/changelog.d/10137.misc
deleted file mode 100644
index a901f8431..000000000
--- a/changelog.d/10137.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add `parse_strings_from_args` for parsing an array from query parameters.
diff --git a/changelog.d/10141.feature b/changelog.d/10141.feature
deleted file mode 100644
index 2658ab891..000000000
--- a/changelog.d/10141.feature
+++ /dev/null
@@ -1 +0,0 @@
-Report OpenTracing spans for database activity.
diff --git a/changelog.d/9221.doc b/changelog.d/9221.doc
deleted file mode 100644
index 9b3476064..000000000
--- a/changelog.d/9221.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify security note regarding hosting Synapse on the same domain as other web applications.
diff --git a/changelog.d/9224.feature b/changelog.d/9224.feature
deleted file mode 100644
index 76519c23e..000000000
--- a/changelog.d/9224.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new endpoint `/_matrix/client/r0/rooms/{roomId}/aliases` from Client-Server API r0.6.1 (previously [MSC2432](https://github.com/matrix-org/matrix-doc/pull/2432)).
diff --git a/changelog.d/9906.misc b/changelog.d/9906.misc
deleted file mode 100644
index 667d51a4c..000000000
--- a/changelog.d/9906.misc
+++ /dev/null
@@ -1 +0,0 @@
-Tell CircleCI to build Docker images from `main` branch.
diff --git a/changelog.d/9953.feature b/changelog.d/9953.feature
deleted file mode 100644
index 6b3d1adc7..000000000
--- a/changelog.d/9953.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve performance of incoming federation transactions in large rooms.
diff --git a/changelog.d/9973.feature b/changelog.d/9973.feature
deleted file mode 100644
index 6b3d1adc7..000000000
--- a/changelog.d/9973.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve performance of incoming federation transactions in large rooms.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 445e8a5ca..58261d04e 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.35.1"
+__version__ = "1.36.0rc1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when