[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

[arma at torproject.org]

commit e0aa88d10662d2ea7cc54f0fd53f5789fdd9a3da
Merge: fa8bb25 75501db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 21 14:30:09 2014 -0400

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

 changes/geoip-july2014  |    3 +
 changes/geoip6-july2014 |    2 +
 src/config/geoip        | 3600 ++++++++++++++++++++++++++++++++--------------
 src/config/geoip6       | 3674 ++++++++++++-----------------------------------
 4 files changed, 3439 insertions(+), 3840 deletions(-)