commit 7f43d24e077fa36ae3d488ad8173db572a10caad Merge: 6a490d303 6d81ca845 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 15 08:06:50 2019 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

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