commit 4559aa8b51c21eee40a529b988d8910023c2b54c Merge: 2a8b789ea6 3f1544bbd9 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 12 08:13:38 2020 -0500 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(-)