commit ba4455538801cc924083bc1200254b9f4a05db13 Merge: c968889a09 0a38e02fb3 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 27 19:15:39 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(-)