commit 55ef4ad7df5c6f0e6e9f0d7c1be55525417c9a02 Author: kudrom kudrom@riseup.net Date: Thu May 15 20:58:18 2014 +0200

Added flag to disable geoip. --- ooni/director.py | 3 ++- ooni/oonicli.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ooni/director.py b/ooni/director.py index b95639a..1bb3668 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -127,7 +127,8 @@ class Director(object): log.msg("Connecting to Tor Control Port...") yield self.getTorState()

- yield config.probe_ip.lookup() + if not config.global_options['no-geoip']: + yield config.probe_ip.lookup()

@property def measurementSuccessRatio(self): diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 889b108..1e3e7ef 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -31,6 +31,7 @@ class Options(usage.Options): optFlags = [["help", "h"], ["resume", "r"], ["no-collector", "n"], + ["no-geoip", "g"], ["list", "s"], ["printdeck", "p"], ["verbose", "v"]