[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

[arma at torproject.org]

commit b840b76b04fa68d2a1ef9a7532837d1b549daa25
Merge: ae15b55 adff7f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 8 10:36:34 2013 -0500

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

 changes/geoip-feb2013 |    3 +
 src/config/geoip      | 3509 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 2353 insertions(+), 1159 deletions(-)