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

[gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

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

dgoulet pushed a commit to branch main
in repository tor.

commit 0df4083299970674b4f399d3d85c6eab22cb8c7d
Merge: f2e9ce72d6 7b83e336ec
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
AuthorDate: Thu Jan 12 10:52:35 2023 -0500

    Merge branch 'maint-0.4.5' into maint-0.4.7

 changes/ticket40730          | 5 +++++
 src/core/proto/proto_socks.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits