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

[nickm at torproject.org]

commit ce89fe36c8d5e6210a2418430c91c3df03d86bdc
Merge: 29842f68e afa2c39ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 11 10:17:18 2019 -0400

    Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-06-10 |     4 +
 src/config/geoip         | 14985 +++++++++++++++++++++++++--------------------
 src/config/geoip6        |  2391 ++++++--
 3 files changed, 9920 insertions(+), 7460 deletions(-)