commit 2ee75d8d1fcb97b96b462d8b5ffbbc8a2c5c8a96 Merge: 0b84394 c597157 Author: aagbsn aagbsn@extc.org Date: Wed Mar 20 11:05:42 2013 -0700

Merge pull request #71 from hellais/feature/probe_ip_lookup

Feature/probe ip lookup

HACKING | 2 +- ooni/director.py | 23 +++--- ooni/errors.py | 11 ++- ooni/geoip.py | 188 ++++++++++++++++++++++++++++++++++++++++++++++++ ooni/nettest.py | 9 +-- ooni/reporter.py | 14 ++-- ooni/runner.py | 2 +- ooni/utils/__init__.py | 7 +- ooni/utils/geodata.py | 45 ------------ tests/test_geoip.py | 137 +++++++++++++++++++++++++++++++++++ tests/test_nettest.py | 3 +- 11 files changed, 366 insertions(+), 75 deletions(-)