commit 11c7e6573013f60d2897720ebbc8c4164e124574 Merge: 48dd87933d 42ba87d964 Author: Alexander Færøy ahf@torproject.org Date: Tue May 25 13:25:23 2021 +0000

Merge branch 'maint-0.3.5' into maint-0.4.4

changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-)