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

[ahf at torproject.org]

commit 8efb9c29e9cf85570d6d08820578cabf50bf337a
Merge: 6db1160f54 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 release-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(-)