[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 c78c8de015ac62eb3fa529f932bcf86dae9f3d9d
Merge: 81a5ee7 0b9c515
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 8 09:22:49 2013 -0400

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

 changes/geoip-july2013 |    3 +
 src/config/geoip       | 2201 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 1425 insertions(+), 779 deletions(-)