commit c63e09043a357c2bf39f37433baa18b365309869 Merge: 1a407612bc fb2c889a38 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 15 07:42:55 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)