commit dcce26331cc7e84a04f907b1bc790596bf9a759f Merge: 4000666ee b2fc57426 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 10 11:52:23 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(-)