Merge branch 'master' into develop

CHANGES.md

@@ -7,6 +7,17 @@ Bugfixes
 - Fix a bug introduced in Synapse 1.40.0 that caused Synapse to fail to process incoming federation traffic after handling a large amount of events in a v1 room. ([\#11806](https://github.com/matrix-org/synapse/issues/11806))
+Synapse 1.50.2 (2022-01-24)
+===========================
+
+This release includes the same bugfix as Synapse 1.51.0rc2.
+
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.40.0 that caused Synapse to fail to process incoming federation traffic after handling a large amount of events in a v1 room. ([\#11806](https://github.com/matrix-org/synapse/issues/11806))
+
+
 Synapse 1.51.0rc1 (2022-01-21)
 ==============================

debian/changelog

@@ -4,11 +4,11 @@ matrix-synapse-py3 (1.51.0~rc2) stable; urgency=medium
 
  -- Synapse Packaging team <packages@matrix.org>  Mon, 24 Jan 2022 12:25:00 +0000
 
-matrix-synapse-py3 (1.51.0~rc1) stable; urgency=medium
+matrix-synapse-py3 (1.50.2) stable; urgency=medium
 
-  * New synapse release 1.51.0~rc1.
+  * New synapse release 1.50.2.
 
- -- Synapse Packaging team <packages@matrix.org>  Fri, 21 Jan 2022 10:46:02 +0000
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 24 Jan 2022 13:37:11 +0000
 
 matrix-synapse-py3 (1.50.1) stable; urgency=medium