nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-12-28 15:57:48 -05:00
commit e3a6493898
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
changes/bug4786 Normal file
View File

@ -0,0 +1,9 @@
- Feature removal:
- When sending or relaying a RELAY_EARLY cell, we used to convert
it to a RELAY cell if the connection was using the v1 link
protocol. This was a workaround for older versions of Tor, which
didn't handle RELAY_EARLY cells properly. Now that all supported
versions can handle RELAY_EARLY cells, and now that we're
enforcing the "no RELAY_EXTEND commands except in RELAY_EARLY
cells" rule, we're removing this workaround. Addresses bug 4786.

4
src/or/relay.c
View File

@ -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);