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

[nickm at torproject.org]

commit 502d2c00625501f312496d842aeb16a840d4d7b0
Merge: 2d61a8351 033e4723f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 15 09:32:44 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-05-01 |    4 +
 src/config/geoip         | 5455 ++++++++++++++++++++++++++++++----------------
 src/config/geoip6        |  971 +++++++--
 3 files changed, 4468 insertions(+), 1962 deletions(-)