commit 39e3abe988d1780782e90f529c2d2e11092d5358 Author: Ana Custura ana@netstat.org.uk Date: Mon Mar 4 20:39:55 2019 +0100

Ensures UseEntryGuards is 0 unless specified or using bridges --- onionperf/measurement.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/onionperf/measurement.py b/onionperf/measurement.py index e2e7bc1..e35e439 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -366,10 +366,12 @@ class Measurement(object): """

tor_config_template = self.base_config + "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" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory {2}\nLog INFO stdout\n" tor_config = tor_config_template.format(control_port, socks_port, tor_datadir) if name == "client" and self.additional_client_conf: tor_config += self.additional_client_conf + if not 'UseEntryGuards' in tor_config and not 'UseBridges' in tor_config: + tor_config += "UseEntryGuards 0" return tor_config

def __start_tor_client(self, control_port, socks_port):