[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

[nickm at torproject.org]

commit 48cd932ed14ca135ffeb91ea4b8b23ad9bb5afe8
Merge: 872d369ce7 1770d1c216
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 17:47:18 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(-)