commit 247dbf891f98b44b35062b871338bbe6efaf3c2b Merge: cee30117c 8933c7908 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 5 13:33:05 2019 -0500

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(-)