diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-28 15:56:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-28 15:56:37 -0500 |
| commit | c563551eefefdf5a8e5e32feb1ca84a517770fda (patch) | |
| tree | c29dd94702a21cfd8debb9cf7c56b060bcfca9cd /src/or | |
| parent | da876aec63b133b64eb6e71f8b87df5c84e7ec3b (diff) | |
| parent | 120a7453465260ddf84770ed1e5e289afe1b14b3 (diff) | |
| download | tor-c563551eefefdf5a8e5e32feb1ca84a517770fda.tar.gz tor-c563551eefefdf5a8e5e32feb1ca84a517770fda.zip | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/relay.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index d9b9d0c486..b637fadf59 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2423,10 +2423,6 @@ append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn, queue = &orcirc->p_conn_cells; streams_blocked = circ->streams_blocked_on_p_conn; } - if (cell->command == CELL_RELAY_EARLY && orconn->link_proto < 2) { - /* V1 connections don't understand RELAY_EARLY. */ - cell->command = CELL_RELAY; - } cell_queue_append_packed_copy(queue, cell); |