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

[dgoulet at torproject.org]

commit 2a5430a4ddd7092690fb8f9fb1c3f2a3c8ddaa69
Merge: 04b0f78f43 70e249123a
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Aug 13 09:48:51 2021 -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(-)