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

commit 342e753d31a91752da19fbcef92e07373b30fac6 Merge: 582f747 4741aa4 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 27 11:22:32 2012 -0400 Merge remote-tracking branch 'karsten/bug5053' changes/bug5053 | 5 +++++ src/or/connection_or.c | 7 ++----- src/or/directory.c | 4 +++- src/or/geoip.c | 34 +++++++++++++++++++++++++--------- src/or/geoip.h | 3 ++- src/test/test.c | 46 +++++++++++++++++++++++++++++++--------------- 6 files changed, 68 insertions(+), 31 deletions(-)