commit b8628ac2a7f1676e7321fe742efbdf75d903700a Merge: cda7f4d8b a3342b382 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 17 19:12:19 2019 -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(-)