commit 9fc50f05741c8c1ce6005784a288c0c8b4654354 Merge: 0772f901b 7174a80ed Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 9 16:04:22 2019 -0500 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(-)