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

[nickm at torproject.org]

commit d6e2516031daa3e081ed7efdbd4e298fd4e7a290
Merge: 60070546a7 520d5c108f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:21:47 2021 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/geoip-2021-06-10 |    3 +
 src/config/geoip         | 4764 +++++++++++++++++++++++++++-------------------
 src/config/geoip6        | 2826 ++++++++++++++++-----------
 3 files changed, 4536 insertions(+), 3057 deletions(-)