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

[nickm at torproject.org]

commit eb3b4dcd792972b59dbbe2aec79f292d3eeab73f
Merge: 9452833fc de76862fd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 3 09:27:44 2019 -0400

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/geoip-2019-04-02 |     4 +
 src/config/geoip         | 10355 +++++++++++++++++++++++++--------------------
 src/config/geoip6        |  2337 ++++++----
 3 files changed, 7344 insertions(+), 5352 deletions(-)