commit 9df20f60762dbd21796bb8c9c621585662e7f708 Merge: e6d634769 a639a6784 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 9 08:25:52 2018 -0400 Merge branch '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(-)