commit 474369e3fa5068d616c25f412608749527231e71 Merge: 8b240fbe40 c48d25ac8d Author: David Goulet <dgoulet@torproject.org> Date: Mon Nov 2 13:14:02 2020 -0500 Merge branch 'tor-gitlab/mr/186' changes/ticket40165 | 5 +++++ changes/ticket40170 | 3 +++ configure.ac | 19 ++++++++++++++++++- src/lib/crypt_ops/compat_openssl.h | 5 ----- src/lib/crypt_ops/crypto_openssl_mgt.c | 13 +++++++++++-- src/lib/crypt_ops/crypto_openssl_mgt.h | 3 +-- src/test/test_tortls_openssl.c | 3 +-- 7 files changed, 39 insertions(+), 12 deletions(-)