commit 4f5d9107750521d746640659af27fd563eabd651 Merge: 772c883 d46b879 Author: Arturo Filastò hellais@users.noreply.github.com Date: Wed Apr 30 18:27:11 2014 +0200

Merge pull request #293 from TheTorProject/refactoring/geoip

Refactoring of geoip related functionality to have it less coupled

ooni/director.py | 3 +-- ooni/geoip.py | 41 +++++++++++++++++++++++++++++++++++------ ooni/nettest.py | 38 ++++---------------------------------- ooni/settings.py | 6 +++--- ooni/utils/log.py | 6 +++++- 5 files changed, 48 insertions(+), 46 deletions(-)