[tor-commits] [tor] 05/06: 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 7654e12be8d8179505add9a7fe381899f73e1aaf
Merge: e98995bb08 e618a7e445
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed Jul 27 11:33:19 2022 -0400

    Merge branch 'maint-0.4.6' into maint-0.4.7

 changes/bug40645             | 5 +++++
 src/core/or/channelpadding.c | 2 +-
 src/core/or/command.c        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)


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