commit ecc1e8eacb9945ec569291e81eacae66c95bb17e Merge: d0ed04d50e 9085508310 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 14 11:49:01 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(-)