commit 306e8f87bcd73461e66386c5e387d4aa2dfb4090 Merge: 926432845b 2933c37188 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 3 13:39:55 2021 -0500

Merge branch 'maint-0.4.4' into release-0.4.4

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