commit 582f784548747bac228d5e5d327d7e7ca039ece5 Merge: 6db0c006b a639a6784 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 9 08:26:08 2018 -0400 Merge branch 'maint-0.3.3' into release-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(-)