commit d83c299eba8010204b3fe0760b1372c7564889fe Merge: 9bfe4ed6d b63404ebb Author: George Kadianakis desnacked@riseup.net Date: Thu Feb 14 18:00:05 2019 +0200

Merge branch 'tor-github/pr/689' into maint-0.3.5

changes/ticket29026 | 4 ++++ src/lib/crypt_ops/aes_openssl.c | 2 +- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_openssl_mgt.h | 2 +- src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 7 files changed, 15 insertions(+), 2 deletions(-)