commit 8d094f2d26f6f793f2b41777547da44dd00eaa64 Merge: 1871693c5 93d582b8e Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 16 19:39:20 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(-)