commit 0f39cc10f65df9fa52123eb607f5f1474c10e58b Merge: 1af7f40da af08dad6d Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 9 09:28:53 2020 -0400
Merge branch 'maint-0.4.3' into maint-0.4.4
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(-)