Merge commit '03619324f' into dinsic

* commit '03619324f':
  Create a ListenerConfig object (#7681)
  Fix changelog wording
  1.15.1
  Wrap register_device coroutine in an ensureDeferred (#7684)
  Ensure the body is a string before comparing push rules. (#7701)
  Ensure etag is a string for GET room_keys/version response (#7691)
  Update m.id.phone to use 'phone' instead of 'number' (#7687)
  Fix "There was no active span when trying to log." error (#7698)
  Enable 3PID add/bind/unbind endpoints on r0 routes
  Discard RDATA from already seen positions. (#7648)
  Replace iteritems/itervalues/iterkeys with native versions. (#7692)
  Fix warnings about losing log context during UI auth. (#7688)
  Fix a typo when comparing the URI & method during UI Auth. (#7689)
  Remove "user_id" from GET /presence. (#7606)
  Increase the default SAML session expirary time to 15 minutes. (#7664)
  fix typo in sample_config.yaml (#7652)
  Take out a lock before modifying _CACHES (#7663)
  Add option to enable encryption by default for new rooms (#7639)
  Clean-up the fallback login code. (#7657)

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/handlers/test_stats.py b/tests/handlers/test_stats.py

index 8e6b0b7536..07092f026a 100644
--- a/tests/handlers/test_stats.py
+++ b/tests/handlers/test_stats.py
@@ -24,8 +24,10 @@ EXPT_NUM_STATE_EVTS_IN_FRESH_PUBLIC_ROOM = 5
 
 # The expected number of state events in a fresh private room.
 #
-# Note: we increase this by 1 on the dinsic branch as we send
-# a "im.vector.room.access_rules" state event into new private rooms
+# Note: we increase this by 2 on the dinsic branch as we send
+# a "im.vector.room.access_rules" state event into new private rooms,
+# and an encryption state event as all private rooms are encrypted
+# by default
 EXPT_NUM_STATE_EVTS_IN_FRESH_PRIVATE_ROOM = 7