[tor-commits] [bridgedb/master] Merge branch 'fix/12872-bridge-geoip_r1' into develop

commit 22d39691f7d4e773b95d172e6c0949b333e14c38 Merge: dd2398c 45b0927 Author: Isis Lovecruft isis@torproject.org Date: Thu Feb 19 04:14:48 2015 +0000

Merge branch 'fix/12872-bridge-geoip_r1' into develop

.travis.yml | 2 +- lib/bridgedb/HTTPServer.py | 32 ++++--------- lib/bridgedb/bridges.py | 17 +++++++ lib/bridgedb/geo.py | 78 ++++++++++++++++++++++++++++++ lib/bridgedb/test/test_bridges.py | 12 +++++ lib/bridgedb/test/test_geo.py | 96 +++++++++++++++++++++++++++++++++++++ 6 files changed, 212 insertions(+), 25 deletions(-)