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

[nickm at torproject.org]

commit aaf8165cd1c28470b0d8007cf2ea161582b57d6b
Merge: 50b503a9f 20e278735
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 13:16:00 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(-)