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

[nickm at torproject.org]

commit d6816de3e09bf35c2b3150f42dc9dbc82651b6fc
Merge: 5f35664b15 621f8a304a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 09:53:57 2021 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/geoip-2021-05-07 |    3 +
 src/config/geoip         | 3227 ++++++++++++++++++++++++++++------------------
 src/config/geoip6        | 1702 ++++++++++++++++--------
 3 files changed, 3098 insertions(+), 1834 deletions(-)