aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/circuituse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-11 18:53:24 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-11 18:53:24 -0500
commitd21fa48cac0f41bd52306e269796559f75855323 (patch)
tree3f58bbe71874b15b205f47e7d7f7620388abbfbc /src/core/or/circuituse.c
parent5dd926caa670002c6d2f15ac78e2282c00c352b6 (diff)
parentefd765a94816bb216e81a4962c94bac385947719 (diff)
downloadtor-d21fa48cac0f41bd52306e269796559f75855323.tar.gz
tor-d21fa48cac0f41bd52306e269796559f75855323.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/core/or/circuituse.c')
-rw-r--r--src/core/or/circuituse.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index e230ad1005..b7a4ab1b9e 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -2377,8 +2377,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
} else {
hs_client_refetch_hsdesc(&edge_conn->hs_ident->identity_pk);
}
- connection_ap_mark_as_non_pending_circuit(conn);
- ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_RENDDESC_WAIT;
+ connection_ap_mark_as_waiting_for_renddesc(conn);
return 0;
}
log_info(LD_REND,"Chose %s as intro point for '%s'.",