commit 9e45d940d466bcefcd1490fc2ae0e5a6298a846f Merge: 8b6d0bd 2a95f31 Author: Andrea Shepard andrea@torproject.org Date: Sat Jun 15 02:20:19 2013 -0700

Merge branch 'bug9072-023' into bug9072-024

changes/bug9072 | 3 +++ src/or/relay.c | 5 +++++ 2 files changed, 8 insertions(+)

diff --cc src/or/relay.c index a26d418,fdb4bff..0f21663 --- a/src/or/relay.c +++ b/src/or/relay.c @@@ -2474,18 -2540,22 +2474,22 @@@ append_cell_to_circuit_queue(circuit_t return;

if (direction == CELL_DIRECTION_OUT) { - queue = &circ->n_conn_cells; - streams_blocked = circ->streams_blocked_on_n_conn; + queue = &circ->n_chan_cells; + streams_blocked = circ->streams_blocked_on_n_chan; } else { orcirc = TO_OR_CIRCUIT(circ); - queue = &orcirc->p_conn_cells; - streams_blocked = circ->streams_blocked_on_p_conn; + queue = &orcirc->p_chan_cells; + streams_blocked = circ->streams_blocked_on_p_chan; }

+ /* + * Disabling this for now because of a possible guard discovery attack + */ + #if 0 /* Are we a middle circuit about to exceed ORCIRC_MAX_MIDDLE_CELLS? */ - if ((circ->n_conn != NULL) && CIRCUIT_IS_ORCIRC(circ)) { + if ((circ->n_chan != NULL) && CIRCUIT_IS_ORCIRC(circ)) { orcirc = TO_OR_CIRCUIT(circ); - if (orcirc->p_conn) { + if (orcirc->p_chan) { if (queue->n + 1 >= ORCIRC_MAX_MIDDLE_CELLS) { /* Queueing this cell would put queue over the cap */ log_warn(LD_CIRC, @@@ -2505,8 -2570,9 +2509,9 @@@ } } } + #endif

- cell_queue_append_packed_copy(queue, cell); + cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids);

/* If we have too many cells on the circuit, we should stop reading from * the edge streams for a while. */