commit 9124845e24e372a8d2a3c9397c4e02dc317fc78c Merge: 94fef11c24 f6b8894726 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 14 13:18:05 2020 -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(-)