commit 07f3345e11530b14c719f8a776f15b943d2fef91 Merge: 515d4f1e93 40eb6b19a3 Author: Alexander Færøy ahf@torproject.org Date: Tue Jul 14 14:47:48 2020 +0000

Merge remote-tracking branch 'tor-gitlab/merge-requests/43' into maint-0.4.4

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