Merge branch 'tor-gitlab/mr/186'

diff --cc configure.ac
Simple merge

diff --cc src/lib/crypt_ops/compat_openssl.h
Simple merge

diff --cc src/lib/crypt_ops/crypto_openssl_mgt.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_openssl_mgt.h
Simple merge

diff --cc src/test/test_tortls_openssl.c
Simple merge