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

[arma at torproject.org]

commit 6acf0ac2851fb95953edea9c231d82f487f28c3d
Merge: 3367a76 9630fb9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 8 11:09:50 2013 -0400

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

 changes/geoip-apr2013 |    3 +
 src/config/geoip      |20949 ++++++++++++-------------------------------------
 2 files changed, 5143 insertions(+), 15809 deletions(-)