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

commit c4531dc02ee9578409925f60b09f0003f2e385ce Merge: 2a5430a4dd fd38609ae2 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 16 08:21:28 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(-)