[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit 790ddd6e0af1be48dc842a28c1599a6027f85b30
Merge: f0a5f91 ef4db31
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Mar 11 14:02:26 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

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