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

commit bcff7f9df9a76d9a2d2b0c68b922f7a174af7d1b Merge: 55b501a865 6ccb858058 Author: Nick Mathewson <nickm@torproject.org> Date: Fri May 28 12:21:27 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(-)