commit ac005aacf588d599abfb95b9c2a54bcffd87dded Merge: c3987a66c9 c3ed4b2e56 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 28 11:20:20 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(-)