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

[nickm at torproject.org]

commit 8376fdb5868565ae4ff91c2748045ea373559055
Merge: 1693b6151e 32f5ad7665
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 13 10:36:00 2021 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/geoip-2021-04-13 |     3 +
 src/config/geoip         | 10953 +++++++++++++++++++++------------------------
 src/config/geoip6        |  2608 +++++++----
 3 files changed, 6970 insertions(+), 6594 deletions(-)