commit 02ba86db9627f841b67a97fd2c06339c8834e89f Merge: ae0cb68964 cfe022d01d Author: David Goulet dgoulet@torproject.org Date: Fri Feb 4 10:56:33 2022 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

changes/geoip-2021-12-15 | 3 + src/config/geoip | 15760 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 10443 ++++++++++++++++++++++-------- 3 files changed, 17373 insertions(+), 8833 deletions(-)