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

[nickm at torproject.org]

commit 9587512578e1c45d62e5e97dd9222fe891c835cd
Merge: 9029444482 968b6c30c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 7 08:10:08 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/ticket40035      |  5 +++++
 src/lib/tls/tortls_nss.c | 10 ++++++++++
 2 files changed, 15 insertions(+)