commit 5ae1389465f9be45530c8e07f7870e021705fe31 Merge: dac18e0b2 40471d73e Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 11 17:06:26 2019 -0400

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(-)