commit 9b9fa62f267a8a53f35da453cb9a1e9b8abbc350 Merge: a980597a67 af6da4a36b Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 10 10:55:16 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(-)