This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit d889eba8752c9394fb797ee9a2aec34f0fe40c64 Merge: 8f48a6082b 1992c553d5 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Dec 6 10:10:41 2022 -0500
Merge branch 'maint-0.4.5' into 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(-)