[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/release-0.3.5] Merge branch 'tor-gitlab/mr/186' into maint-0.3.5
commit 2cf1365c17822f5e925c4c0bc3bd0367a3a657a8
Merge: 3ebf75993f c48d25ac8d
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date: Thu Jan 28 12:00:10 2021 -0500
Merge branch 'tor-gitlab/mr/186' into maint-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@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits