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

[nickm at torproject.org]

commit 7d9e0055ace0b62d33d182747a545ebf0aa76ca4
Merge: 7a59b9f549 95914ceb57
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 27 08:33:42 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(-)