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

commit e05304902c616c41b9520e2b7730e399401b68fe Merge: 93ed011a2 cb69a5a11 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 18 12:18:31 2020 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)