commit df6e03a09268d5996295dd61cbee3e4845395c6e Merge: 08e4b8d2fc 9280f32fc0 Author: David Goulet <dgoulet@torproject.org> Date: Tue Oct 26 09:18:08 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(-)