commit 7a8aa8e36dfb6116d305986a1d060d509543a3ed Merge: 955aa02c0d 9a4366b3e3 Author: David Goulet dgoulet@torproject.org Date: Thu Dec 16 09:28:17 2021 -0500

Merge branch 'maint-0.4.6'

changes/fallbackdirs-2021-12-15 | 2 + changes/geoip-2021-12-15 | 3 + src/app/config/fallback_dirs.inc | 960 +-- src/config/geoip | 15760 +++++++++++++++++++++++-------------- src/config/geoip6 | 10443 +++++++++++++++++------- 5 files changed, 17866 insertions(+), 9302 deletions(-)