This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit b20f72943e694c70b7a7fdfaea63f67cd4187f51 Merge: e6899dcdf4 f501564b40 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Oct 26 14:06:33 2022 -0400
Merge branch 'tor-gitlab/mr/629' into maint-0.4.7
changes/ticket40680 | 6 ++++ src/core/or/dos.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++-- src/core/or/dos.h | 4 +++ src/core/or/relay.c | 54 ++++++++++++++++++++++++++----- src/core/or/relay.h | 2 ++ 5 files changed, 149 insertions(+), 10 deletions(-)