[tor-commits] [tor] 04/08: Merge branch 'maint-0.4.7'

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit d75d02d20221a72c15b384ff8863d042d5532e67 Merge: 38ab412a2b d889eba875 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Dec 6 10:10:41 2022 -0500

Merge branch 'maint-0.4.7'

changes/fallbackdirs-2022-12-06 | 2 + changes/geoip-2022-12-06 | 3 + src/app/config/fallback_dirs.inc | 972 +++--- src/config/geoip | 5870 +++++++++++++++++++----------------- src/config/geoip6 | 6070 ++++++++++++++++++++++++++++---------- 5 files changed, 8250 insertions(+), 4667 deletions(-)