commit 01fd3ace03f587efa550322aef78681d25c7c214 Merge: bd3ed77191 2fff1fc835 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 30 08:18:42 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(-)