aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2003-12-03 09:50:02 +0000
committerRoger Dingledine <arma@torproject.org>2003-12-03 09:50:02 +0000
commitd172fdd300677eb696482e74c92b0352de82fec5 (patch)
tree02e623eb376fc115484285b56057e8549899a37e /src/or/connection.c
parent05b9c35173e901825fdd3e5ddd44358942593c0c (diff)
downloadtor-d172fdd300677eb696482e74c92b0352de82fec5.tar
tor-d172fdd300677eb696482e74c92b0352de82fec5.tar.gz
fix vicious bug in connection_ap_attach_pending that caused it to
never work. fix vicious bug in choose_good_exit_server that caused it to *skip over* pending circuits, and look only at *non-pending circuits*, when choosing a good exit node for the new circuit. bugfix: remove incorrect asserts in circuit_get_newest() svn:r876
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 138348e05..e4aba9620 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -44,7 +44,7 @@ char *conn_state_to_string[][_CONN_TYPE_MAX+1] = {
"", /* 2 */
"", /* 3 */
"awaiting dest info", /* app, 4 */
- "waiting for OR connection", /* 5 */
+ "waiting for safe circuit", /* 5 */
"open" }, /* 6 */
{ "ready" }, /* dir listener, 0 */
{ "", /* dir, 0 */