[tor-commits] [ooni-probe/master] Merge pull request #340 from TheTorProject/feature/12771

[art at torproject.org]

commit 3f68f1521b90961632d93d022c940b32d2985721
Merge: 137ddd8 60efdba
Author: aagbsn <aagbsn at extc.org>
Date:   Wed Aug 13 16:35:05 2014 +0000

    Merge pull request #340 from TheTorProject/feature/12771
    
    Feature/12771

 ooni/geoip.py            |   53 +++++++++++++++++++++++++++++++++++++++++-----
 ooni/nettest.py          |    4 +++-
 ooni/tests/test_geoip.py |   13 ++++++++++--
 3 files changed, 62 insertions(+), 8 deletions(-)