commit 968b6c30c1158fde003a99a7d22a575e3b211c91 Merge: e0e0ef713e 40eb6b19a3 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 7 08:09:59 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)