From 01209382fbb5ccf7bdef71f1d42f754b125f625a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 10 Feb 2020 18:07:35 +0000
Subject: [PATCH 1/2] filter out m.room.aliases from /sync state blocks (#6884)

We forgot to filter out aliases from /sync state blocks as well as the timeline.
---
 changelog.d/6884.feature | 1 +
 synapse/handlers/sync.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/6884.feature

diff --git a/changelog.d/6884.feature b/changelog.d/6884.feature
new file mode 100644
index 0000000000..4f6b9630b8
--- /dev/null
+++ b/changelog.d/6884.feature
@@ -0,0 +1 @@
+Filter out m.room.aliases from /sync state blocks until a full fix lands.
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index cd95f85e3f..2b62fd83fd 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -883,6 +883,7 @@ class SyncHandler(object):
             for e in sync_config.filter_collection.filter_room_state(
                 list(state.values())
             )
+            if e.type != EventTypes.Aliases  # until MSC2261 or alternative solution
         }
 
     async def unread_notifs_for_room_id(self, room_id, sync_config):

From 3edc65dd24f1916501e24e2353b4523bc2e3635c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 11 Feb 2020 10:43:16 +0000
Subject: [PATCH 2/2] 1.10.0rc4

---
 CHANGES.md               | 9 +++++++++
 changelog.d/6884.feature | 1 -
 synapse/__init__.py      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/6884.feature

diff --git a/CHANGES.md b/CHANGES.md
index 4a81a04627..f776560de7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.10.0rc4 (2020-02-11)
+==============================
+
+Features
+--------
+
+- Filter out m.room.aliases from /sync state blocks until a full fix lands. ([\#6884](https://github.com/matrix-org/synapse/issues/6884))
+
+
 Synapse 1.10.0rc3 (2020-02-10)
 ==============================
 
diff --git a/changelog.d/6884.feature b/changelog.d/6884.feature
deleted file mode 100644
index 4f6b9630b8..0000000000
--- a/changelog.d/6884.feature
+++ /dev/null
@@ -1 +0,0 @@
-Filter out m.room.aliases from /sync state blocks until a full fix lands.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 36c0cf557a..cc69ff0c41 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.10.0rc3"
+__version__ = "1.10.0rc4"
 
 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