commit 6134379c4a36eaa2ee0809482b3b6630f03c7871 Merge: 65d268c77b 26a07287a4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 28 11:20:21 2021 -0500 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(-)