summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorMatthew <matthew@matrix.org>2017-01-07 03:46:16 +0000
committerMatthew <matthew@matrix.org>2017-01-07 03:46:16 +0000
commit6d363cea9d201b1e3807a991b4f88bdf9793d604 (patch)
treec74dec00f1e708b3f22c7473b6f247a4863981d8 /CHANGES.rst
parentMerge branch 'release-v0.18.7' into develop (diff)
parentbump changelog & version (diff)
downloadsynapse-6d363cea9d201b1e3807a991b4f88bdf9793d604.tar.xz
Merge branch 'release-v0.18.7' into develop
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst10
1 files changed, 10 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 3db747df38..3fb3197ace 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse v0.18.7-rc2 (2017-01-07)
+===========================================
+
+Bug fixes:
+
+* Fix error in rc1's discarding invalid inbound traffic logic that was
+  incorrectly discarding missing events
+
 Changes in synapse v0.18.7-rc1 (2017-01-06)
 ===========================================
 
@@ -5,6 +13,8 @@ Bug fixes:
 
 * Fix error in #PR 1764 to actually fix the nightmare #1753 bug.
 * Improve deadlock logging further
+* Discard inbound federation traffic from invalid domains, to immunise
+  against #1753
 
 Changes in synapse v0.18.6 (2017-01-06)
 =======================================