commit af46b1d8cd045ecc024719f42e50bd342a2aeca8 Merge: 30711296f 3517d2032 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 9 13:15:59 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(-)