commit 793c4a3c922765f92b7eabc4aa179043e61105a8 Merge: 39344e410 b9504f788 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 9 16:04:22 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)