commit a68c4538f2bd584be9a838ac365433cabfc2b5e8 Author: teor (Tim Wilson-Brown) teor2345@gmail.com Date: Wed Jul 27 16:30:43 2016 +1000

Configure a ControlPort for every tor instance run by chutney

(Not just for clients.)

Implements feature #19765. --- torrc_templates/client.tmpl | 1 - torrc_templates/common.i | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/torrc_templates/client.tmpl b/torrc_templates/client.tmpl index b7b6859..e0fbad9 100644 --- a/torrc_templates/client.tmpl +++ b/torrc_templates/client.tmpl @@ -1,6 +1,5 @@ ${include:common.i} SocksPort $socksport -ControlPort $controlport CookieAuthentication 1

#NOTE: Setting TestingClientConsensusDownloadSchedule doesn't diff --git a/torrc_templates/common.i b/torrc_templates/common.i index e244565..2776ca1 100644 --- a/torrc_templates/common.i +++ b/torrc_templates/common.i @@ -46,3 +46,5 @@ ProtocolWarnings 1 SafeLogging 0 DisableDebuggerAttachment 0 ${authorities} + +ControlPort $controlport