commit 1c5dd021a7666806284b851ecb1879704df8020e Merge: 5232091616 8a17999da3 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 3 13:39:54 2021 -0500

Merge branch 'maint-0.4.3' into release-0.4.3

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