[tor-commits] [tor] 01/01: Merge branch 'maint-0.4.7' into release-0.4.7

[gitolite role]

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

dgoulet pushed a commit to branch release-0.4.7
in repository tor.

commit 3b149097855a49d2ffae40a85d2b570c3095eb80
Merge: 1ee37f32f3 0df4083299
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Thu Jan 12 10:52:35 2023 -0500

    Merge branch 'maint-0.4.7' into release-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.