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

[nickm at torproject.org]

commit fa7ce6d3be62061de73176ffb939aa8d353d4014
Merge: 4056c61 b45f0f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 13 12:52:40 2014 -0400

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

 changes/geoip-august2014  |    3 +
 changes/geoip6-august2014 |    3 +
 doc/tor.1.txt             |    2 +-
 src/config/geoip          | 5217 +++++++++++++++++++++++++++++++++------------
 src/config/geoip6         | 2012 ++++++-----------
 5 files changed, 4518 insertions(+), 2719 deletions(-)