commit 1cc6cccdff39599da592d14c97806305b6d5588a Merge: 60d1fb3d37 2758ae30b3 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 30 12:02:34 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(-)