[tor-commits] [bridgedb/master] Merge branch 'fix/10446-geoip-module' into develop

[isis at torproject.org]

commit 3890690c50aca896db1b2cfd95e5e592885f1ee1
Merge: 2cf7c73 ac3ffd0
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Dec 20 05:46:44 2013 +0000

    Merge branch 'fix/10446-geoip-module' into develop

 README                     |    8 +++++---
 lib/bridgedb/HTTPServer.py |   25 ++++++++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)