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

[dgoulet at torproject.org]

commit d4f68f1c69cf53d3be71a6111c8a13049dae2a36
Merge: c8872ca88a fa405ca27f
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Oct 28 09:42:43 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

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