Clean up old trust settings

diff --git a/master b/master
index 59af82e0fed4c1cc8ceaf81635d7ad5e50e61c84..002239b6b68c04bc8d9f1da11551686d126895fb 100644 (file)
--- a/master
+++ b/master
@@ -82,9 +82,7 @@ domainlist relay_domains = !+virtual_domains : partial1-lsearch;CLUSTER/relay-do
 
 # Trust the boxes in the cluster, and also trust vger since it sends our
 # users so much mail, and has fairly decent checks of its own.
-hostlist trust_hosts = baythorne.infradead.org : \
-                      twosheds.infradead.org : \
-                      canuck.infradead.org : \
+hostlist trust_hosts = twosheds.infradead.org : \
                       merlin.infradead.org : \
                       205.233.59.134 : 2001::4978::20e::::2 : \
                       bombadil.infradead.org : \
@@ -94,7 +92,7 @@ hostlist trust_hosts = baythorne.infradead.org : \
                        lists.sourceforge.net : \
                        mx.meyering.net
 
-hostlist rbl_bypass_hosts = 61.155.114.21 : ham-cannon.twitter.com
+hostlist rbl_bypass_hosts = 61.155.114.21
 
 trusted_users = mail
 #never_users = root