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

[nickm at torproject.org]

commit d3894dc34b66fc5090b674ff850071aaf319d1c8
Merge: a4e8f9450 9faa28b60
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:11:41 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/geoip-2018-07-03 |    4 +
 src/config/geoip         | 7171 ++++++++++++++++++++--------------------------
 src/config/geoip6        |  752 +++--
 3 files changed, 3732 insertions(+), 4195 deletions(-)