commit a17be1b5b619cd5e12a9973df9b9a0cffc40b0ff
Merge: c3ed4b2e56 c6fb26695b
Author: David Goulet <[email protected]>
Date: Thu Jan 28 12:04:42 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
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(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
