Merge branch 'libressl_201805_029' into maint-0.3.3

diff --cc src/common/compat_openssl.h
index 1299ac36bbaa37cc136233ce5c81cc8874b68693,76679872bc6366ae80a5e3921b0d483dfe733bd7..d1481fb46cb175f7b48310ba4dd9d49aacc78dd9
--- 1/src/common/compat_openssl.h
--- 2/src/common/compat_openssl.h
+++ b/src/common/compat_openssl.h
@@@ -8,7 -8,9 +8,8 @@@
  #define TOR_COMPAT_OPENSSL_H
  
  #include <openssl/opensslv.h>
 -// workaround for libressl; not needed in later Tor versions.
 -#include <openssl/crypto.h>
 +#include "crypto_openssl_mgt.h"
+ 
  /**
   * \file compat_openssl.h
   *
@@@ -25,10 -27,13 +26,13 @@@
  /* We define this macro if we're trying to build with the majorly refactored
   * API in OpenSSL 1.1 */
  #define OPENSSL_1_1_API
 -#endif
 +#endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */
  
- #ifndef OPENSSL_1_1_API
+ #ifndef OPENSSL_VERSION
  #define OPENSSL_VERSION SSLEAY_VERSION
+ #endif
+ 
+ #ifndef OPENSSL_1_1_API
  #define OpenSSL_version(v) SSLeay_version(v)
  #define OpenSSL_version_num() SSLeay()
  #define RAND_OpenSSL() RAND_SSLeay()

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