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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.5' into release-0.3.5

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