[tor-commits] [tor] 02/03: 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 b33f69abb54d06b324301977e87171d5902a39bf
Merge: b4890e7534 9ac479ce1c
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Thu Apr 14 09:34:49 2022 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/bug40472                 | 6 ++++++
 src/feature/dircommon/consdiff.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)


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