[tor-commits] [tor] 04/04: 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 b113b08722be7a47adb8285e7250f6fa7a569a69 Merge: 40aab72031 b20f72943e Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Oct 26 14:07:49 2022 -0400

Merge branch 'maint-0.4.7'

changes/bug40673 | 2 +- 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 ++ 6 files changed, 150 insertions(+), 11 deletions(-)