[tor-commits] [tor/main] Merge branch 'maint-0.4.4' into maint-0.4.5

[nickm at torproject.org]

commit d60f8fe98a59ce13809e65de67e53b3dcf6199f0
Merge: c80b98520b 57a41348ee
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:21:48 2021 -0400

    Merge branch 'maint-0.4.4' into maint-0.4.5

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