[tor-commits] [tor] 03/04: Merge branch 'maint-0.4.6' into maint-0.4.7

[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 645eff49ac0c382c8eeb228b31cace885077e5ec
Merge: af5ef98d1b e69cf2340b
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Tue Aug 2 16:08:50 2022 -0400

    Merge branch 'maint-0.4.6' into maint-0.4.7

 changes/ticket40604         | 5 +++++
 src/core/or/connection_or.c | 4 ++++
 2 files changed, 9 insertions(+)


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