nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug14334_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2016-04-07 10:59:55 -04:00
commit 591029253f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug14334 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (guards):
- Don't mark guards as unreachable if connection_connect() fails. That
function fails for local reasons, so it shouldn't reveal anything about
the status of the guard. Fixes bug #14334; bugfix on 0.2.3.10-alpha.

8
src/or/connection_or.c
View File

@ -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));