[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/mmdb-convert'

commit 9d0af78e3cffde924ec65247cd8ef97cf5319d28 Merge: c64b549 436f710 Author: Nick Mathewson nickm@torproject.org Date: Sat Feb 15 00:08:36 2014 -0500

Merge remote-tracking branch 'karsten/mmdb-convert'

src/config/README.geoip | 90 --------- src/config/deanonymind.py | 205 -------------------- src/config/geoip-manual | 80 -------- src/config/mmdb-convert.py | 446 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 446 insertions(+), 375 deletions(-)