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

[nickm at torproject.org]

commit c142045be26a527059112d34e06a12796ba6b204
Merge: 328078c3a0 3d3dc08ed8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 9 17:14:58 2020 -0500

    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(-)