commit 7178b59b2123f08afc676a1d54be2db48416d432 Merge: 637d7c25df bf29d3b4ae Author: David Goulet <dgoulet@torproject.org> Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 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(-)