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

[nickm at torproject.org]

commit 7142f3e435f99e357c7a7b55d4542ac7f6584f47
Merge: 3e08dd9df 7b2d10700
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 09:28:36 2020 -0400

    Merge branch 'trove_2020_001_035' into maint-0.3.5

 changes/bug33119               |  4 +++
 src/lib/tls/tortls_nss.c       | 47 +++++++++++++++++++++++----
 src/test/test_tortls.c         | 73 ++++++++++++++++++++++++++++++++++++++++++
 src/test/test_tortls_openssl.c | 70 ----------------------------------------
 4 files changed, 118 insertions(+), 76 deletions(-)