diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-20 14:40:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-20 14:40:16 -0500 |
| commit | 14127f226d0e80201e8feac1ce0b8482ae701007 (patch) | |
| tree | af1199808e3b7bf541b70f56ef62de5919778d77 | |
| parent | 26053bd7c90b2bd8e72bc836c48434c8d6de633f (diff) | |
| parent | 0cfdd88adb6fcd6f75d0e571ed2cc9ae3e559ded (diff) | |
| download | tor-14127f226d0e80201e8feac1ce0b8482ae701007.tar.gz tor-14127f226d0e80201e8feac1ce0b8482ae701007.zip | |
Merge remote-tracking branch 'asn-mytor/bug4531'
| -rw-r--r-- | src/or/connection_or.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index cbe678d6cf..7609138e68 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -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; |