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

[nickm at torproject.org]

commit c71b7db8f354bd5469856eea60107ce25b9aac13
Merge: ee421e6 da1e44e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jan 19 09:36:55 2013 -0500

    Merge remote-tracking branch 'karsten/bug5823'

 changes/bug5823    |    5 ++
 src/or/directory.c |   27 ++++----
 src/or/geoip.c     |  194 +++++++---------------------------------------------
 src/or/geoip.h     |    7 +-
 src/test/test.c    |    5 +-
 5 files changed, 48 insertions(+), 190 deletions(-)