commit 18754f96579cc920922bb0565df2d6e48402d898 Merge: 16954b3ec0 18db584caf Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 15 09:55:43 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(-)