[tor-commits] [tor/main] Merge branch 'maint-0.4.6' into main

[ahf at torproject.org]

commit de5f94000cd9dbb3ba503f66d95f2bba230dfb78
Merge: 22552ad88e bab2b29f89
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue May 25 13:25:23 2021 +0000

    Merge branch 'maint-0.4.6' into main

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