Merge remote-tracking branch 'origin/release-v1.7.1' into matrix-org-hotfixes

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/visibility.py b/synapse/visibility.py

index dffe943b28..100dc47a8a 100644
--- a/synapse/visibility.py
+++ b/synapse/visibility.py
@@ -52,7 +52,8 @@ def filter_events_for_client(
     apply_retention_policies=True,
 ):
     """
-    Check which events a user is allowed to see
+    Check which events a user is allowed to see. If the user can see the event but its
+    sender asked for their data to be erased, prune the content of the event.
 
     Args:
         storage