commit 3799f3116bfb6ee2dc8f25ec90a5a9b7d17021ee Merge: 75e5b778e 308eec753 Author: Nick Mathewson nickm@torproject.org Date: Fri May 11 08:09:26 2018 -0400

Merge remote-tracking branch 'saper-github/x509_cert_free_crash'

src/test/test_tortls.c | 53 +++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 22 deletions(-)