commit bf29d3b4ae865213706ee19095262f669716f766
Merge: f8fea8b979 7ae74203e1
Author: David Goulet <[email protected]>
Date: Thu Jan 28 12:00:17 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(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
