diff options
| -rw-r--r-- | src/or/circuitbuild.c | 2 | ||||
| -rw-r--r-- | src/or/connection_or.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 3 | ||||
| -rw-r--r-- | src/or/relay.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2875222c76..9f09b67944 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1917,7 +1917,7 @@ entry_is_live(entry_guard_t *e, int need_uptime, int need_capacity, if (e->bad_since) return NULL; /* no good if it's unreachable, unless assume_unreachable or can_retry. */ - if ((!assume_reachable && !e->can_retry) && + if (!assume_reachable && !e->can_retry && e->unreachable_since && !entry_is_time_to_retry(e, time(NULL))) return NULL; r = router_get_by_digest(e->identity); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 02921e1981..5a15bddbca 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -898,6 +898,8 @@ connection_or_set_state_open(or_connection_t *conn) * chose not to use it. (Otherwise * connection_about_to_close_connection() will call a big pile of * functions to indicate we shouldn't try it again.) */ + log_debug(LD_OR, "New entry guard was reachable, but closing this " + "connection so we can retry the earlier entry guards."); circuit_n_conn_done(conn, 0); return -1; } diff --git a/src/or/or.h b/src/or/or.h index c85242cc4b..271bef02a0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -673,7 +673,8 @@ typedef enum { #define LEGAL_NICKNAME_CHARACTERS \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -/** Name to use in client TLS certificates if no nickname is given. */ +/** Name to use in client TLS certificates if no nickname is given. Once + * Tor 0.1.2.x is obsolete, we can remove this. */ #define DEFAULT_CLIENT_NICKNAME "client" /** Number of bytes in a SOCKS4 header. */ diff --git a/src/or/relay.c b/src/or/relay.c index 33ee055cea..2fd557a0de 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1289,7 +1289,7 @@ uint64_t stats_n_data_bytes_received = 0; * and the appropriate package windows aren't empty, grab a cell * and send it down the circuit. * - * Return -1 (and send a RELAY_END cell if necessary) if conn should + * Return -1 (and send a RELAY_COMMAND_END cell if necessary) if conn should * be marked for close, else return 0. */ int |