commit b100c9e9800c1d504c2d69d556642189c39d099d Merge: 8b3b605a1 4dd96f744 Author: teor teor@torproject.org Date: Sat Apr 6 12:15:41 2019 +1000

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

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