Merge remote-tracking branch 'origin/release-v1.35.0' into release-v1.35

CHANGES.md

+Synapse 1.35.0rc2 (2021-05-27)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request. ([\#10079](https://github.com/matrix-org/synapse/issues/10079))
+
+
 Synapse 1.35.0rc1 (2021-05-25)
 ==============================

changelog.d/10079.bugfix

-Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request.

synapse/__init__.py

@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.35.0rc1"
+__version__ = "1.35.0rc2"
 
 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