[tor-commits] [tor] 02/04: Merge branch 'maint-0.4.5' into maint-0.4.6

[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 e69cf2340be05aaaa2d4df4085f236742696bf86
Merge: e618a7e445 0c984e0ec2
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Tue Aug 2 16:08:50 2022 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 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.