[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5

[teor at torproject.org]

commit 955cf9620c68c17f6531e80f9f4a7fa7d9f0f479
Merge: 3287cae68 4dd96f744
Author: teor <teor at torproject.org>
Date:   Mon Aug 12 09:40:08 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5

 changes/29241_diagnostic |  4 ++++
 changes/bug29241         |  6 ++++++
 src/lib/tls/tortls_nss.c | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)