commit 0e8c16e2298753a67d13fb26a2a9a457dabdd46a Merge: 439ca4898 3b2a73207 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 20 11:17:06 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(-)