commit cd54568df42e35aad2563c1c87f0a36097228ca5 Author: Arturo Filastò art@fuffa.org Date: Tue Nov 27 03:29:42 2012 +0100

s/config.tor.socksport/config.tor.socks_port/ --- ooni/reporter.py | 2 +- ooni/templates/httpt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/reporter.py b/ooni/reporter.py index dac9aba..8e4eede 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -259,7 +259,7 @@ class OONIBReporter(OReporter): from twisted.internet import reactor try: self.agent = Agent(reactor, sockshost="127.0.0.1", - socksport=int(config.advanced.tor_socksport)) + socksport=int(config.tor.socks_port)) except Exception, e: log.exception(e)

diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index b8bd9a7..e3c8efe 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -64,7 +64,7 @@ class HTTPTest(NetTestCase): "not work")

self.control_agent = Agent(reactor, sockshost="127.0.0.1", - socksport=config.advanced.tor_socksport) + socksport=config.tor.socks_port)

self.report['socksproxy'] = None sockshost, socksport = (None, None)