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

[nickm at torproject.org]

commit 6acbd4c112d984c8a3fcfa1a387093131b740ca7
Merge: b343ba906 4aa3d511b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 15 09:32:44 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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