commit a639a67844909bd05fadaea5c1847f5e9af55cde Merge: b979415e8 bf3e899dc Author: Nick Mathewson nickm@torproject.org Date: Wed May 9 08:25:32 2018 -0400

Merge branch 'libressl_201805_033' into maint-0.3.3

changes/ticket26006 | 4 ++++ src/common/compat_openssl.h | 6 +++++- src/test/test_tortls.c | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-)