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

[nickm at torproject.org]

commit 089466eff356454b0e0eb4e1d432057504a9a4d6
Merge: 39bb283fc 3248630fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 6 16:02:08 2019 -0500

    Merge branch 'maint-0.4.2'

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