commit 5d0c1ba019a2b88129e46879df2aff5e1acec58c Merge: 672c72d7d cafb99981 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 30 15:54:21 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(-)