commit 64e266b710217e140fed1b370420f17c05831c56 Merge: 251efd11e 2e80d7f19 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Apr 13 17:02:53 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(-)