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

[nickm at torproject.org]

commit 9666c620d584b2c715596b415a808941b17cbda0
Merge: 04d4786cc c9b76a12f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 11 12:23:33 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-2017-11-06 |    4 +
 src/config/geoip         | 9406 ++++++++++++++++++++++++++++------------------
 src/config/geoip6        |  848 ++++-
 3 files changed, 6426 insertions(+), 3832 deletions(-)