commit 9c12558af595281708c4fab5705c5395134f45e4 Merge: eaa34dd6b 8bc3ac6a8 Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 23 08:45:07 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(-)