summary refs log tree commit diff
diff options
context:
space:
mode:
authorJeroen <vo.jeroen@gmail.com>2018-07-27 12:17:31 +0200
committerJeroen <vo.jeroen@gmail.com>2018-07-27 12:17:31 +0200
commit8e3f75b39abb846687ac905d8e31d7f41372e5d7 (patch)
tree7fa687feabe2429cff0239e4455b11a99523dfc3
parentMerge branch 'develop' into send_sni_for_federation_requests (diff)
downloadsynapse-8e3f75b39abb846687ac905d8e31d7f41372e5d7.tar.xz
fix accidental removal of hs
-rw-r--r--synapse/crypto/keyring.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index 762e4b8014..30e2742102 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -512,7 +512,7 @@ class Keyring(object):
                 continue
 
             (response, tls_certificate) = yield fetch_server_key(
-                server_name, self.tls_client_options_factory,
+                server_name, self.hs.tls_client_options_factory,
                 path=(b"/_matrix/key/v2/server/%s" % (
                     urllib.quote(requested_key_id),
                 )).encode("ascii"),