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

[nickm at torproject.org]

commit 8646b4dde78a7e7d82de1cefc134b3f9f921624d
Merge: cb51b0d55 3248630fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 6 16:02:08 2019 -0500

    Merge branch 'maint-0.4.2' into release-0.4.2

 changes/geoip-2019-12-03 |     4 +
 src/config/geoip         | 13933 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |  4621 ++++++++-------
 3 files changed, 10717 insertions(+), 7841 deletions(-)