commit 2bd52e2adc36a678ebd4b04ebbb7e5f00484348b Merge: 8390aa1c44 81a4f92b64 Author: David Goulet dgoulet@torproject.org Date: Fri Feb 4 11:10:07 2022 -0500

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(-)