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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.8' into maint-0.2.9

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