[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 07ab483e62457ee56187037304f25ec50cb0850a
Merge: 09759a6 118d8ff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 7 11:55:17 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/feature2711 |    4 +
 src/or/control.c    |    4 +-
 src/or/geoip.c      |  172 ++++++++++++++++++++++++++++-----------------------
 src/or/geoip.h      |    2 +-
 4 files changed, 101 insertions(+), 81 deletions(-)