Merge commit '55bb5fda3' into anoa/dinsic_release_1_21_x

* commit '55bb5fda3':
  1.20.0
  Add a note about including the changes from 1.19.3.
  Tweak wording in the changelog.

Author: anoadragon453

CHANGES.md

@@ -1,16 +1,24 @@
+Synapse 1.20.0 (2020-09-22)
+===========================
+
+No significant changes.
+
+
 Synapse 1.20.0rc5 (2020-09-18)
 ==============================
 
+In addition to the below, Synapse 1.20.0rc5 also includes the bug fix that was included in 1.19.3.
+
 Features
 --------
 
-- Add flags to the `/versions` endpoint that includes whether new rooms default to using E2EE. ([\#8343](https://github.com/matrix-org/synapse/issues/8343))
+- Add flags to the `/versions` endpoint for whether new rooms default to using E2EE. ([\#8343](https://github.com/matrix-org/synapse/issues/8343))
 
 
 Bugfixes
 --------
 
-- Fix ratelimitng of federation `/send` requests. ([\#8342](https://github.com/matrix-org/synapse/issues/8342))
+- Fix rate limiting of federation `/send` requests. ([\#8342](https://github.com/matrix-org/synapse/issues/8342))
 - Fix a longstanding bug where back pagination over federation could get stuck if it failed to handle a received event. ([\#8349](https://github.com/matrix-org/synapse/issues/8349))
 
 

debian/changelog

@@ -1,8 +1,12 @@
-matrix-synapse-py3 (1.20.0ubuntu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.20.0) stable; urgency=medium
 
+  [ Synapse Packaging team ]
+  * New synapse release 1.20.0.
+
+  [ Dexter Chua ]
   * Use Type=notify in systemd service
 
- -- Dexter Chua <[email protected]>  Wed, 26 Aug 2020 12:41:36 +0000
+ -- Synapse Packaging team <[email protected]>  Tue, 22 Sep 2020 15:19:32 +0100
 
 matrix-synapse-py3 (1.19.3) stable; urgency=medium
 

synapse/__init__.py

@@ -48,7 +48,7 @@
 except ImportError:
     pass
 
-__version__ = "1.20.0rc5"
+__version__ = "1.20.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