Merge branch 'master' into develop

CHANGES.md

@@ -1,5 +1,5 @@
-Synapse 1.30.0rc1 (2021-03-16)
+Synapse 1.30.0 (2021-03-22)
-==============================
+===========================
 
 Note that this release deprecates the ability for appservices to
 call `POST /_matrix/client/r0/register`  without the body parameter `type`. Appservice
@@ -8,6 +8,13 @@ per [the spec](https://matrix.org/docs/spec/application_service/r0.1.2#server-ad
 In future releases, calling this endpoint with an access token - but without a `m.login.application_service`
 type - will fail.
 
+
+No significant changes.
+
+
+Synapse 1.30.0rc1 (2021-03-16)
+==============================
+
 Features
 --------
 
@@ -34,7 +41,7 @@ Bugfixes
 Updates to the Docker image
 ---------------------------
 
-- Use jemalloc if available in docker. ([\#8553](https://github.com/matrix-org/synapse/issues/8553))
+- Make use of an improved malloc implementation (`jemalloc`) in the docker image. ([\#8553](https://github.com/matrix-org/synapse/issues/8553))
 
 
 Improved Documentation

debian/changelog

@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.30.0) stable; urgency=medium
+
+  * New synapse release 1.30.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 22 Mar 2021 13:15:34 +0000
+
 matrix-synapse-py3 (1.29.0) stable; urgency=medium
 
   [ Jonathan de Jong ]

synapse/__init__.py

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