commit ed5afc081d9c54f4948e50e38d1877c0aa63019c Merge: fd123afa06 774374ebf5 Author: David Goulet dgoulet@torproject.org Date: Fri Feb 4 11:09:24 2022 -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(-)