commit 0cf39387be61521d0289957bf1578735378d5ef5 Merge: 7a9325a96f 5eef63aa71 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 22 09:49:37 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(-)