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

[nickm at torproject.org]

commit 6e37ba5543fc0351fe10709bd16cdfddae1de479
Merge: fa22cc651 bcf2b413c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 7 15:18:00 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-september2017 |     4 +
 src/config/geoip            | 10802 ++++++++++++++++++++++++------------------
 src/config/geoip6           |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)