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

[nickm at torproject.org]

commit 9630fb917f3549b3fcbd4a3885e0c47f4be9be36
Merge: ebb95d0 b41f03f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 8 11:09:26 2013 -0400

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

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