[tor-commits] [tor] 03/03: Merge branch 'tor-gitlab/mr/722'

[gitolite role]

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

dgoulet pushed a commit to branch main
in repository tor.

commit 7a83aa4f5042905844cb9ab48a4876becd8f2175
Merge: cdb270d55e 17037f8732
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Thu Jun 15 13:23:36 2023 -0400

    Merge branch 'tor-gitlab/mr/722'

 changes/bug40811           |  6 ++++++
 src/core/or/conflux_pool.c | 13 +++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

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