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

[nickm at torproject.org]

commit c2e49a01151fd7a765408081a5067c7a3eee6b99
Merge: bd7174bb9 283ce30c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 09:28:53 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

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