commit ec2af981dd47c305a94d3406f7ee17515ad1836e Merge: d7460667a aab5f42ae Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 24 09:33:15 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)