commit 1e9a87cb928a54c0f10ba7b2e066e17725082d77 Merge: a5a6d47081 07f3345e11 Author: Alexander Færøy ahf@torproject.org Date: Tue Jul 14 14:48:21 2020 +0000

Merge branch 'maint-0.4.4' into release-0.4.4

changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)