commit 0b843947b56b09d13346c221081ce63f32cdea5f Merge: 091e45e f5ccc32 Author: Arturo Filastò art@fuffa.org Date: Wed Mar 20 13:50:38 2013 -0400

Merge branch 'feature/pygeoip'

* feature/pygeoip: Support CPython with patch from lunar https://trac.torproject.org/projects/tor/ticket/8507

ooni/utils/geodata.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)