diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-07 10:59:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-07 10:59:55 -0400 |
| commit | 591029253f4b79de0ecd47c464623b0ce13270ef (patch) | |
| tree | 995254df95be6544f4ca7d0c1a8698d69eacdbb6 /src/or/connection_or.c | |
| parent | 7532cd439bc7d95a7c38b3c72bed0b3e46a26fa2 (diff) | |
| parent | d5acb633aed08a9ee4436404971ffa7fe0cca030 (diff) | |
| download | tor-591029253f4b79de0ecd47c464623b0ce13270ef.tar.gz tor-591029253f4b79de0ecd47c464623b0ce13270ef.zip | |
Merge branch 'bug14334_squashed'
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 87e7230540..f8be763792 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1281,11 +1281,9 @@ connection_or_connect, (const tor_addr_t *_addr, uint16_t port, switch (connection_connect(TO_CONN(conn), conn->base_.address, &addr, port, &socket_error)) { case -1: - /* If the connection failed immediately, and we're using - * a proxy, our proxy is down. Don't blame the Tor server. */ - if (conn->base_.proxy_state == PROXY_INFANT) - entry_guard_register_connect_status(conn->identity_digest, - 0, 1, time(NULL)); + /* We failed to establish a connection probably because of a local + * error. No need to blame the guard in this case. Notify the networking + * system of this failure. */ connection_or_connect_failed(conn, errno_to_orconn_end_reason(socket_error), tor_socket_strerror(socket_error)); |