summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-02-04 23:27:35 +0000
committerRoger Dingledine <arma@torproject.org>2009-02-04 23:27:35 +0000
commitdecdf4537ab9d2fc8301a01f7b7ce1b47b109f98 (patch)
treecc250ef7b1e3a01d49d0f072cca05691ba2b1064 /src/or/connection.c
parent8977f24eb8810d68c8fed09f5e81a0b0e0350a23 (diff)
downloadtor-decdf4537ab9d2fc8301a01f7b7ce1b47b109f98.tar.gz
tor-decdf4537ab9d2fc8301a01f7b7ce1b47b109f98.zip
If we're using bridges and our network goes away, be more willing
to forgive our bridges and try again when we get an application request. Bugfix on 0.2.0.x. svn:r18396
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 56b31ad8e1..3812dd8e3e 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -572,9 +572,8 @@ connection_about_to_close_connection(connection_t *conn)
if (connection_or_nonopen_was_started_here(or_conn)) {
or_options_t *options = get_options();
rep_hist_note_connect_failed(or_conn->identity_digest, now);
- entry_guard_register_connect_status(or_conn->identity_digest,0,now);
- if (!options->HttpsProxy)
- router_set_status(or_conn->identity_digest, 0);
+ entry_guard_register_connect_status(or_conn->identity_digest,0,
+ !options->HttpsProxy, now);
if (conn->state >= OR_CONN_STATE_TLS_HANDSHAKING) {
int reason = tls_error_to_orconn_end_reason(or_conn->tls_error);
control_event_or_conn_status(or_conn, OR_CONN_EVENT_FAILED,