commit 3090839168377f17998cd9c4b7321aab7d9286c8 Merge: d211b20fb ec7f99e6e Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 29 19:44:48 2020 -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(-)