From c9b7d97d14f8cf7b99af78140bf1911291afe189 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 25 Sep 2019 13:23:40 +0100
Subject: [PATCH] Fetch keys directly before using trusted key servers

Fixes #6086.
---
 synapse/crypto/keyring.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index 7cfad192e83a..7e7f5e64a76d 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -105,8 +105,8 @@ def __init__(self, hs, key_fetchers=None):
         if key_fetchers is None:
             key_fetchers = (
                 StoreKeyFetcher(hs),
-                PerspectivesKeyFetcher(hs),
                 ServerKeyFetcher(hs),
+                PerspectivesKeyFetcher(hs),
             )
         self._key_fetchers = key_fetchers