[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

commit eb0600c6b45ab59efb4e71d4aec02c5f3f249391 Merge: 88290b7cd df3484b2b Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 21 09:58:52 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(-)