Commit e3a64938 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

parents 2b189a22 c563551e

changes/bug4786

0 → 100644
+9 −0
Original line number Diff line number Diff line 
  - 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.

src/or/relay.c

+0 −4
Original line number Diff line number Diff line
@@ -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);