commit a7cbbdbbdaba3195d658d21dd7ba41cb025250f3 Merge: 8bd79bd75e 26b257757b Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 13 09:44:30 2020 -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(-)