aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuit.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/circuit.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/circuit.c')
-rw-r--r--src/or/circuit.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c
index 3a352f9c4..05307769e 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -211,12 +211,10 @@ circuit_t *circuit_get_newest(connection_t *conn, int must_be_open) {
}
}
if(!newest || newest->timestamp_created < circ->timestamp_created) {
- assert(circ->n_circ_id);
newest = circ;
}
if(conn && circ->timestamp_dirty &&
(!leastdirty || leastdirty->timestamp_dirty < circ->timestamp_dirty)) {
- assert(circ->n_circ_id);
leastdirty = circ;
}
}