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

[nickm at torproject.org]

commit 2984d991653b70fcd561d7d0bd693c46220cec74
Merge: 2c93be80d d6bdec159
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 5 11:03:35 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-october2017 |    4 +
 src/config/geoip          | 8683 +++++++++++++++++++++++++++------------------
 src/config/geoip6         |  653 ++--
 3 files changed, 5654 insertions(+), 3686 deletions(-)