commit 4f20c0d9d4e1b2023053b384e15f770dc2fe670d Merge: b3ec9e961e 041a0a362f Author: David Goulet dgoulet@torproject.org Date: Fri Aug 13 09:48:50 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)