commit 737cd79c42576ce47db89e2f2b7bc2f95ba363a2 Merge: f8fea8b979 a17be1b5b6 Author: David Goulet <dgoulet@torproject.org> Date: Thu Jan 28 12:04:42 2021 -0500 Merge branch 'maint-0.4.3' into maint-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(-)