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

[nickm at torproject.org]

commit 9bcd9523bea0c78dc17a1f0ca8c8f204b0e57584
Merge: 2bc49d3828 aa6c7741e8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:30:21 2021 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/geoip-2021-03-12 |      9 +
 src/config/geoip         | 144354 ++++++++++++++------------------------------
 src/config/geoip6        |  62679 +++++++++++++++----
 3 files changed, 95249 insertions(+), 111793 deletions(-)