This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit c65d8b2aad4b881fd67f3740b14d997b0c61e815 Merge: 9e8f76d430 65ffb97c2f Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Aug 11 09:44:47 2022 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
changes/fallbackdirs-2022-08-11 | 2 + changes/geoip-2022-08-11 | 3 + src/app/config/fallback_dirs.inc | 987 +- src/config/geoip | 55637 +++++++++++++++++++++++++------------ src/config/geoip6 | 18884 ++++++------- 5 files changed, 47346 insertions(+), 28167 deletions(-)