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

[nickm at torproject.org]

commit 1bbfadfa6158064a86533323a50be60d4c93934e
Merge: 25f9ecf 6acf0ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 8 11:10:07 2013 -0400

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

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