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

[dgoulet at torproject.org]

commit 88a3edb1c8161683d170029ab9f6e8ce9e2607e2
Merge: c4efc42b5c 00d7337002
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Dec 16 12:22:27 2021 -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(-)