[tor-commits] [tor] 10/10: Merge branch 'tor-gitlab/mr/721'

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

dgoulet pushed a commit to branch main in repository tor.

commit 44368a727a85f9f24dc45c11f31958005d158ed6 Merge: d5306e107f 7ffda7512d Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Jun 14 09:45:27 2023 -0400

Merge branch 'tor-gitlab/mr/721'

changes/bug40801 | 10 +++++ changes/bug40810 | 4 ++ src/core/or/conflux.c | 21 ++++++--- src/core/or/conflux_pool.c | 106 ++++++++++++++++++++++++++++++++++++++++----- src/core/or/conflux_pool.h | 3 ++ src/core/or/conflux_util.c | 42 +++++++++++++----- src/core/or/relay.c | 8 ++-- 7 files changed, 162 insertions(+), 32 deletions(-)