[tor-commits] [tor] 05/05: Merge branch 'maint-0.4.6' into release-0.4.6

[gitolite role]

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

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

commit 726441421c5fe4d7e0878d872f140cec004b61e7
Merge: f76d516982 111b2d3a9f
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Fri Aug 12 10:17:16 2022 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 configure.ac                        | 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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