[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 64410cc88888ff964a82613cc53475def98d9de7
Merge: 0b9c515 41bf8fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 12 09:44:36 2013 -0400

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

 changes/geoip-august2013 |    3 +
 src/config/geoip         | 9207 +++++++++++++++++++++++-----------------------
 2 files changed, 4521 insertions(+), 4689 deletions(-)