commit ded1695a66a868e9878e091ff1d0c47d18a7f636 Merge: 26465179fa fd22fa183b Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 12 08:13:37 2020 -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(-)