[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit 325c507a090589ada4f0a781a313214c7cfd33a0
Merge: 1a7af74 104e8fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 9 09:58:45 2017 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-june2017 |    4 +
 src/config/geoip       | 5079 +++++++++++++++++++++++++-----------------------
 src/config/geoip6      | 1952 +++++++++++++++++--
 3 files changed, 4449 insertions(+), 2586 deletions(-)