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

[nickm at torproject.org]

commit a920597f629c4eee959e0f789d7b6da48da74579
Merge: 8b1f99c29 29eb7b07e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 11 10:14:04 2019 -0500

    Merge branch 'maint-0.4.1' into maint-0.4.2

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