[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

Mon Nov 4 08:54:48 UTC 2013

commit 39fc5b114969cc9f76ac56f287f3310d964714cc
Merge: 77cfa98 4e1c1ca
Author: Arturo FilastÃ² <art at fuffa.org>
Date:   Mon Nov 4 09:53:59 2013 +0100

    Merge branch 'master' of github.com:TheTorProject/ooni-probe
    
    * 'master' of github.com:TheTorProject/ooni-probe:
      Add GeoIP city data to report

 ooni/nettest.py |    1 +
 1 file changed, 1 insertion(+)