[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/197' into master

[nickm at torproject.org]

commit 41bea71adc0d92b745cbedd454556cbdb52a4046
Merge: c79957581e b22568a545
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 16 22:43:09 2020 -0500

    Merge remote-tracking branch 'tor-gitlab/mr/197' into master

 src/lib/crypt_ops/compat_openssl.h     | 3 ++-
 src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +-
 src/lib/tls/tortls_openssl.c           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)