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

[nickm at torproject.org]

commit 14f3f8e341f53d4d703d05a24aab855926845c87
Merge: 6d3b80819 0e7558ab6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:19:29 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-july2017 |     4 +
 src/config/geoip       | 10075 ++++++++++++++++++++++++++++++++---------------
 src/config/geoip6      |   694 +++-
 3 files changed, 7530 insertions(+), 3243 deletions(-)