[tor-commits] [onionperf/master] Ensures tor is not run as daemon by overriding option in base config string

[irl at torproject.org]

commit 99fc039dc53f310c6615818296936c67dbf69b1d
Author: Ana Custura <ana at nestat.org.uk>
Date:   Mon Feb 25 13:59:59 2019 +0100

    Ensures tor is not run as daemon by overriding option in base config string
---
 onionperf/measurement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/onionperf/measurement.py b/onionperf/measurement.py
index ce2c215..cd8b038 100644
--- a/onionperf/measurement.py
+++ b/onionperf/measurement.py
@@ -358,7 +358,7 @@ class Measurement(object):
         tor_datadir = "{0}/tor-{1}".format(self.datadir_path, name)
         if not os.path.exists(tor_datadir): os.makedirs(tor_datadir)
 
-        tor_config_template = "ORPort 0\nDirPort 0\nControlPort {0}\nSocksPort {1}\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\
+        tor_config_template = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort {0}\nSocksPort {1}\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\
 WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nUseEntryGuards 0\nDataDirectory {2}\nLog INFO stdout\n"
         tor_config = tor_config_template.format(control_port, socks_port, tor_datadir)