diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-12-28 15:57:48 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-12-28 15:57:48 -0500 |
commit | e3a6493898fdca78b3b562f7cf870a26be526f70 (patch) | |
tree | f0998cc5dd971d0f6024d156548d30ca9f75bc57 /src | |
parent | 2b189a222b76bad7c194442819f3181151f0198f (diff) | |
parent | c563551eefefdf5a8e5e32feb1ca84a517770fda (diff) | |
download | tor-e3a6493898fdca78b3b562f7cf870a26be526f70.tar.gz tor-e3a6493898fdca78b3b562f7cf870a26be526f70.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src')
-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 4c0b7718d5..90d8015cb8 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2522,10 +2522,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); |