[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 c860a96ecb652d76dc23f2b490db4f5a95e9b0c3
Merge: c03cfc0 fe689de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 11:22:19 2013 -0400

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

 changes/geoip-june2013 |    3 +
 src/config/geoip       |106050 +++++-------------------------------------------
 2 files changed, 9168 insertions(+), 96885 deletions(-)