commit bffba45796f4d4521c817e995d1f6055d9fef43a Merge: f66fa8eba5 1956f63d6b Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 7 13:32:35 2021 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)