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

[nickm at torproject.org]

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 6 16:02:07 2019 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.5

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