[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 4aa3d511b25fe99579d7810418433eef46e417da
Merge: 7ee67c47f 502d2c006
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 15 09:32:44 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

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