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

[nickm at torproject.org]

commit c7d3bedf310443da2cbbdd8b0e8e182a15b7d64a
Merge: 68a002c60 a74c18069
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 2 08:01:34 2019 -0400

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/geoip-2019-10-01 |     4 +
 src/config/geoip         | 35299 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |  8318 ++++++++---
 3 files changed, 26359 insertions(+), 17262 deletions(-)