Merge branch 'master' into develop

CHANGES.md

@@ -1,3 +1,20 @@
+Synapse 1.7.1 (2019-12-18)
+==========================
+
+This release includes several security fixes as well as a fix to a bug exposed by the security fixes. Administrators are encouraged to upgrade as soon as possible.
+
+Security updates
+----------------
+
+- Fix a bug which could cause room events to be incorrectly authorized using events from a different room. ([\#6501](https://github.com/matrix-org/synapse/issues/6501), [\#6503](https://github.com/matrix-org/synapse/issues/6503), [\#6521](https://github.com/matrix-org/synapse/issues/6521), [\#6524](https://github.com/matrix-org/synapse/issues/6524), [\#6530](https://github.com/matrix-org/synapse/issues/6530), [\#6531](https://github.com/matrix-org/synapse/issues/6531))
+- Fix a bug causing responses to the `/context` client endpoint to not use the pruned version of the event. ([\#6553](https://github.com/matrix-org/synapse/issues/6553))
+- Fix a cause of state resets in room versions 2 onwards. ([\#6556](https://github.com/matrix-org/synapse/issues/6556), [\#6560](https://github.com/matrix-org/synapse/issues/6560))
+
+Bugfixes
+--------
+
+- Fix a bug which could cause the federation server to incorrectly return errors when handling certain obscure event graphs. ([\#6526](https://github.com/matrix-org/synapse/issues/6526), [\#6527](https://github.com/matrix-org/synapse/issues/6527))
+
 Synapse 1.7.0 (2019-12-13)
 ==========================
 

changelog.d/6501.misc

@@ -1 +0,0 @@
-Refactor get_events_from_store_or_dest to return a dict.

changelog.d/6503.misc

@@ -1 +0,0 @@
-Move get_state methods into FederationHandler.

changelog.d/6521.misc

@@ -1 +0,0 @@
-Refactor some code in the event authentication path for clarity.

changelog.d/6524.misc

@@ -1,2 +0,0 @@
-Improve sanity-checking when receiving events over federation.
-

changelog.d/6526.bugfix

@@ -1 +0,0 @@
-Fix a bug which could cause the federation server to incorrectly return errors when handling certain obscure event graphs.

changelog.d/6527.bugfix

@@ -1 +0,0 @@
-Fix a bug which could cause the federation server to incorrectly return errors when handling certain obscure event graphs.

changelog.d/6530.misc

@@ -1,2 +0,0 @@
-Improve sanity-checking when receiving events over federation.
-

changelog.d/6531.misc

@@ -1 +0,0 @@
-Improve sanity-checking when receiving events over federation.

changelog.d/6553.bugfix

@@ -1 +0,0 @@
-Fix a bug causing responses to the `/context` client endpoint to not use the pruned version of the event.

changelog.d/6556.bugfix

@@ -1 +0,0 @@
-Fix a cause of state resets in room versions 2 onwards.

changelog.d/6560.bugfix

@@ -1 +0,0 @@
-Fix a cause of state resets in room versions 2 onwards.

debian/changelog

@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.7.1) stable; urgency=medium
+
+  * New synapse release 1.7.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 18 Dec 2019 09:37:59 +0000
+
 matrix-synapse-py3 (1.7.0) stable; urgency=medium
 
   * New synapse release 1.7.0.

synapse/__init__.py

@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.7.0"
+__version__ = "1.7.1"
 
 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