Merge remote-tracking branch 'private/release-v1.135-hydra' into release-v1.135

synapse/event_auth.py

@@ -65,8 +65,8 @@ from synapse.api.room_versions import (
     RoomVersion,
     RoomVersions,
 )
-from synapse.state import CREATE_KEY
 from synapse.events import is_creator
+from synapse.state import CREATE_KEY
 from synapse.storage.databases.main.events_worker import EventRedactBehaviour
 from synapse.types import (
     MutableStateMap,

synapse/handlers/room.py

@@ -584,6 +584,7 @@ class RoomCreationHandler:
                 old_room_create_event,
                 tombstone_event_id,
                 new_room_version,
+                additional_creators=additional_creators,
             )
         initial_state = {}
 

tests/storage/test_redaction.py

@@ -244,7 +244,6 @@ class RedactionTestCase(unittest.HomeserverTestCase):
             def __init__(self, base_builder: EventBuilder, event_id: str):
                 self._base_builder = base_builder
                 self._event_id = event_id
-                self.room_version = base_builder.room_version
 
             async def build(
                 self,