commit 016044b95e00233677a13183f81eca3c4b9559b0 Merge: b36a00e9a9 40eeb63b5e Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 1 16:14:26 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(-)