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

[nickm at torproject.org]

commit 111f988b5c586ce34a1e482561a988f4794ea6e8
Merge: 253a45115 a920597f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 11 10:14:04 2019 -0500

    Merge branch 'maint-0.4.2' into release-0.4.2

 changes/geoip-2019-11-06 |     4 +
 src/config/geoip         | 15751 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3078 ++++++---
 3 files changed, 11485 insertions(+), 7348 deletions(-)