commit 80ea44cbecb9e50b601ba407d59cf61db8c0a909 Merge: 993238aa2d 8142b368e7 Author: Nick Mathewson nickm@torproject.org Date: Fri May 7 09:44:05 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)