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

[nickm at torproject.org]

commit 641c1584f7be8de88d3c58eae96c5c022a4870d1
Merge: e7e92fb e0aa88d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 21 14:30:27 2014 -0400

    Merge remote-tracking branch 'origin/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(-)