Merge branch 'maint-0.2.9' into maint-0.3.2

diff --cc configure.ac
Simple merge

diff --cc src/common/tortls.c
index 03c0be1cd065f949cd7c9fa76ac14bdc544bab30,1f2fe1ce186a6ccb8fe24c098508e8bb212e59bb..6efc8c3e4b602a75c83e7dda99590584719c71e6
--- 1/src/common/tortls.c
--- 2/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -1171,7 -1129,12 +1171,13 @@@ tor_tls_context_new(crypto_pk_t *identi
  #else
    if (!(result->ctx = SSL_CTX_new(SSLv23_method())))
      goto error;
 -#endif
 +#endif /* defined(HAVE_TLS_METHOD) */
++
+ #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL
+   /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */
+   SSL_CTX_set_security_level(result->ctx, 1);
+ #endif
+ 
    SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2);
    SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3);