commit b0399c60269647678b873f3ca47cabb3888bbd8f Merge: 32a0bc2a8 0f39cc10f Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 9 09:28:53 2020 -0400

Merge branch '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(-)