commit 869fa2a2ef5978a6fc328f4d30376ecd1b06e2d2
Merge: dec3041952 2cf1365c17
Author: David Goulet <dgou...@torproject.org>
Date: Thu Jan 28 12:00:17 2021 -0500
Merge branch 'maint-0.3.5' into release-0.3.5
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
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
