commit 2ee184baccea01b47ea9510f1aeacde71fc5e6b7 Merge: 744ba41ed ebc7556dd Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 21 09:36:55 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(-)