commit 29ed93d92f55a8c71818ca63d98d4f7a6d68d45e Merge: 7aa75d0738 ec0b4bdafd Author: Nick Mathewson <nickm@torproject.org> Date: Fri May 7 09:44:04 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(-)