commit a93f7363378f90a2faf98f7a3e67707b1be37362 Merge: fecc195294 94fb308c5d Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 16 09:18:52 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(-)