[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 a3ddd702f609a5a5ed5ca3ed1ade1435a833bcb8
Merge: 9da84f71a9 661c214f4b
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Thu Aug 11 10:23:44 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.