commit a2e39fa3b014dda71d6d6ece1cb7f8e114fd1c06 Merge: 4f20c0d9d4 2984fba97a Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 16 08:21:28 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(-)