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

[nickm at torproject.org]

commit 5b8b9a97b4ae0eba050fe9d22dcac67c09996a87
Merge: 2a4c0ce21 75fc33f33
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 14 10:39:00 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 configure.ac                        | 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)