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

[nickm at torproject.org]

commit 93b28972c10cfc87ab1865bead3ba713901d9d79
Merge: 0e7558ab6 1280de42a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 3 08:44:31 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-august2017 |     4 +
 src/config/geoip         | 10796 ++++++++++++++++++++++++++++-----------------
 src/config/geoip6        |   607 ++-
 3 files changed, 7161 insertions(+), 4246 deletions(-)