commit 30711296fd5b7f51ef6f4d7b3fbe20f12990c02c Merge: 412546c48 7ba849349 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 9 10:32:39 2020 -0400 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(-)