commit 8390aa1c448a89ad38b5c86f43e726295b53fdc4 Merge: df2c354d17 728191fc2e Author: David Goulet dgoulet@torproject.org Date: Fri Feb 4 11:07:34 2022 -0500

Merge branch 'maint-0.4.6' into release-0.4.6

changes/fallbackdirs-2022-02-04 | 2 + changes/geoip-2022-02-04 | 3 + src/app/config/fallback_dirs.inc | 987 ++--- src/config/geoip | 8815 ++++++++++++++++++++++---------------- src/config/geoip6 | 4881 ++++++++++++--------- 5 files changed, 8344 insertions(+), 6344 deletions(-)