This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit e465f511a5fea99d742c87d7f8093cd292c7b972 Merge: 5cc6ab0c1e 13d2d1246f Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Aug 10 13:41:25 2022 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
src/config/geoip | 18774 ++++++++++++++++++++++++++++++++-------------------- src/config/geoip6 | 9466 ++++++++++++++++---------- 2 files changed, 17835 insertions(+), 10405 deletions(-)