[tor-commits] [tor] 01/01: Merge branch 'maint-0.4.7' into release-0.4.7

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch release-0.4.7
in repository tor.

commit 020ec678b1e2df21a7a58032f9200aec1e7e385c
Merge: 706241fd73 b20f72943e
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed Oct 26 14:07:49 2022 -0400

    Merge branch 'maint-0.4.7' into release-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(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.