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

[nickm at torproject.org]

commit ad024c86c4223ddbef3fecc65861511374700beb
Merge: ec36d1c95 f0646919a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 10 10:29:27 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(-)