summaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-09-09 06:25:39 +0000
committerRoger Dingledine <arma@torproject.org>2008-09-09 06:25:39 +0000
commitd37fae2f4edb03095f943577f78b518f75f6ca71 (patch)
tree65affa5651b1e0b1de42fe96ef4245974fbfbcc3 /src/or/circuituse.c
parentaacda9cd8eae992c9359279782234dd626415948 (diff)
downloadtor-d37fae2f4edb03095f943577f78b518f75f6ca71.tar.gz
tor-d37fae2f4edb03095f943577f78b518f75f6ca71.zip
Catch and report a few more bootstrapping failure cases when Tor
fails to establish a TCP connection. Cleanup on 0.2.1.x. svn:r16803
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 8dfc607c16..5f1cd5b62d 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -756,9 +756,6 @@ circuit_build_failed(origin_circuit_t *circ)
"(%s:%d). I'm going to try to rotate to a better connection.",
n_conn->_base.address, n_conn->_base.port);
n_conn->_base.or_is_obsolete = 1;
- if (n_conn->_base.state < OR_CONN_STATE_TLS_HANDSHAKING &&
- !n_conn->socket_error)
- n_conn->socket_error = END_OR_CONN_REASON_TIMEOUT;
entry_guard_register_connect_status(n_conn->identity_digest, 0,
time(NULL));
}