commit 0330eeb3e35d2092f4d488a38bcca98db4632fc5 Merge: ae1466e103 336c45f1a5 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 15 13:00:38 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(-)