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

[teor at torproject.org]

commit a51f5b9b3631fea573229787f463b2b2c2ffb5c3
Merge: 6428fa359 b100c9e98
Author: teor <teor at torproject.org>
Date:   Sat Apr 6 12:16:01 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

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