commit bab2b29f89f21781a87010cf7120615615b90599 Merge: debede5e50 4a7379b80a Author: Alexander Færøy ahf@torproject.org Date: Tue May 25 13:25:23 2021 +0000

Merge branch 'maint-0.4.5' into maint-0.4.6

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