[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 ef4db3169344567f30fb72e3e9a66154b976d889
Merge: 0196647 c6ca199
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 11 13:32:16 2013 -0400

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

 changes/geoip-mar2013 |    3 +
 src/config/geoip      |92875 +++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 85446 insertions(+), 7432 deletions(-)