commit 849fde27fe6555fd28400a4a00996899ee6983c1 Merge: 61c6049fa8 be17a5a3cf Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 07:42:55 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(-)