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

[nickm at torproject.org]

commit 289adbce584d2c42665d1e4fb6adeb77e0d4e037
Merge: bd664bca9 74cae547e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 6 16:02:07 2019 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

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