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

[nickm at torproject.org]

commit b057623bedad74b147d71f00c47dca7bd5fac14a
Merge: 2cadd93ce 119df9c1c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 11:34:48 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-10-09 |     4 +
 src/config/geoip         | 38518 ++++++++++++++++++++++++++++++++++-----------
 src/config/geoip6        |  1317 +-
 3 files changed, 30779 insertions(+), 9060 deletions(-)