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

[dgoulet at torproject.org]

commit 4c58953fc21108fc7cc6ebce1ee4f21d535e95fa
Merge: 22fd351cf5 5afdc851b2
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Feb 4 12:36:45 2022 -0500

    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(-)