[tor-commits] [chutney/master] Require authentication on all Tor control ports

[teor at torproject.org]

commit 84ccf71356781babfa3bb1c536ebe99d5d7e2b1b
Author: teor <teor2345 at gmail.com>
Date:   Wed Feb 15 13:56:49 2017 +1100

    Require authentication on all Tor control ports
    
    Closes 21461, bugfix on 19765.
---
 torrc_templates/client.tmpl | 1 -
 torrc_templates/common.i    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/torrc_templates/client.tmpl b/torrc_templates/client.tmpl
index e0fbad9..3aff6cb 100644
--- a/torrc_templates/client.tmpl
+++ b/torrc_templates/client.tmpl
@@ -1,6 +1,5 @@
 ${include:common.i}
 SocksPort $socksport
-CookieAuthentication 1
 
 #NOTE: Setting TestingClientConsensusDownloadSchedule doesn't
 #      help -- dl_stats.schedule is not DL_SCHED_CONSENSUS
diff --git a/torrc_templates/common.i b/torrc_templates/common.i
index 2776ca1..1bdc6de 100644
--- a/torrc_templates/common.i
+++ b/torrc_templates/common.i
@@ -48,3 +48,4 @@ DisableDebuggerAttachment 0
 ${authorities}
 
 ControlPort $controlport
+CookieAuthentication 1