commit 9ad7906f41f184fbbd064d71eea59ad52583892a Merge: f44c12a708 edc9fda4f5 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 11 12:48:25 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(-)