commit 6585289fe75c07816ba9eed204df9f73215cc262 Merge: bb00238432 494ced690d Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 9 17:14:58 2020 -0500 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(-)