Merge branch 'bug17549'

diff --cc src/test/test_tortls.c
index fd3d50cf7e777537f83d04b8ba6f54d6ab83cc42,90bf0d3ce5e594e55d67b1d916f873f63a2a07f0..dceecf49ab64dd135858207a4e54b40e7ec262c8
--- 1/src/test/test_tortls.c
--- 2/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@@ -53,9 -53,11 +53,12 @@@
  extern tor_tls_context_t *server_tls_context;
  extern tor_tls_context_t *client_tls_context;
  
 -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)
 +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) \
 +    && !defined(LIBRESSL_VERSION_NUMBER)
  #define OPENSSL_OPAQUE
+ #define SSL_STATE_STR "before SSL initialization"
+ #else
+ #define SSL_STATE_STR "before/accept initialization"
  #endif
  
  #ifndef OPENSSL_OPAQUE