commit 21cd621a2484e17dc1b3be4d1816f4917ddbc39d Merge: e5c47d295b 01be7cc535 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 12 16:10:02 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(-)