commit 1cd40f532efadf716f1ce63f21e22730d40614c8 Merge: a0b827eb5b 862c44e4ec Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 12 08:13:37 2020 -0500 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(-)