Commit 14127f22 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'asn-mytor/bug4531'

parents 26053bd7 0cfdd88a

src/or/connection_or.c

+3 −2
Original line number Diff line number Diff line
@@ -1099,12 +1099,13 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) 
  conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING;

  tor_assert(!conn->tls);

  conn->tls = tor_tls_new(conn->_base.s, receiving);

  tor_tls_set_logged_address(conn->tls, // XXX client and relay?

      escaped_safe_str(conn->_base.address));

  if (!conn->tls) {

    log_warn(LD_BUG,"tor_tls_new failed. Closing.");

    return -1;

  }

  tor_tls_set_logged_address(conn->tls, // XXX client and relay?

      escaped_safe_str(conn->_base.address));



#ifdef USE_BUFFEREVENTS

  if (connection_type_uses_bufferevent(TO_CONN(conn))) {

    const int filtering = get_options()->_UseFilteringSSLBufferevents;