commit 4cffc7fe9cfff03a122ddecc3447136f8a82387b Merge: f213a35b2 b100c9e98 Author: teor <teor@torproject.org> Date: Sat Apr 6 12:23:25 2019 +1000 Merge branch 'maint-0.4.0' changes/29241_diagnostic | 4 ++++ changes/bug29241 | 6 ++++++ src/lib/tls/tortls_nss.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+)