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

[nickm at torproject.org]

commit 9cec7a7b5c6a947642ae81942f68e96fa403fc9f
Merge: d86896b29 c7f9f7e54
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 17 08:10:17 2019 -0400

    Merge branch 'maint-0.4.0'

 changes/geoip-2019-05-13 |     4 +
 src/config/geoip         | 15407 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |  3771 +++++++----
 3 files changed, 11335 insertions(+), 7847 deletions(-)