commit d5efc2c98619568e0af2790a30c462a26fd8bae7
Merge: 2ae7a71f43 fadb57e853
Author: David Goulet <dgoulet(a)torproject.org>
Date: Tue Oct 26 09:18:08 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(-)