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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.2' into maint-0.4.3

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