From ce651b4a905b1ca69634272d6b4cde00a3f35063 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Fri, 12 Jul 2019 15:19:43 -0400
Subject: [PATCH] remove obsolete consistency check

tor-listeners.listeners was checked against listen,
but listen is obsolete now, so config load would fail
on a config that used the new style `listeners` instead of
`listen` --- unless tor-listeners.listeners was empty, which
it should be under the new style, but there's no need to enforce
that
---
 irc/config.go | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/irc/config.go b/irc/config.go
index 7e10da15..9423e13e 100644
--- a/irc/config.go
+++ b/irc/config.go
@@ -797,19 +797,6 @@ func LoadConfig(filename string) (config *Config, err error) {
 		}
 	}
 
-	for _, listenAddress := range config.Server.TorListeners.Listeners {
-		found := false
-		for _, configuredListener := range config.Server.Listen {
-			if listenAddress == configuredListener {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return nil, fmt.Errorf("%s is configured as a Tor listener, but is not in server.listen", listenAddress)
-		}
-	}
-
 	err = config.prepareListeners()
 	if err != nil {
 		return nil, fmt.Errorf("failed to prepare listeners: %v", err)