commit 2b1742b0759982a70c022481d7aeafeed818d8d4 Merge: 2504bce7c3 6f776001cb Author: David Goulet <dgoulet@torproject.org> Date: Tue Oct 26 09:18:08 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)