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

[nickm at torproject.org]

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5
Merge: 58e1c6dd8 93b28972c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 3 08:44:31 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

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