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

[nickm at torproject.org]

commit 90017323942dc56b23d98c34894542e30856aeac
Merge: 3f1544bbd9 7c0778ef7e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 16 22:42:22 2020 -0500

    Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/bug40179_part1  | 4 ++++
 src/test/hs_ntor_ref.py | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)