commit bed245bd1e77137e566104577f5767ea5fba56e4 Merge: 24e808e946 bf5bf33661 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 15 08:53:02 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(-)