commit af602fff9fe68d6f90aca86583d91a495d00954b Merge: f8d028e14a c80b98520b Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 7 13:32:36 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(-)