diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-08 10:49:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-08 10:49:24 -0400 |
| commit | aa42f941dc58ff7554e31dc6f15e4d23f639f351 (patch) | |
| tree | 820fd82c59c1ab5cdbd01faaaf2a668d96417de4 /src/or/relay.h | |
| parent | 669fd05ed8cf7b90bb9e43dbbbbd35f40bf05fa0 (diff) | |
| parent | 296a7d83880d75296d6665295f9fc4cb41cb63d8 (diff) | |
| download | tor-aa42f941dc58ff7554e31dc6f15e4d23f639f351.tar.gz tor-aa42f941dc58ff7554e31dc6f15e4d23f639f351.zip | |
Merge branch 'bug1653'
Diffstat (limited to 'src/or/relay.h')
| -rw-r--r-- | src/or/relay.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay.h b/src/or/relay.h index 73855a52bf..088ef3228a 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -45,7 +45,8 @@ void cell_queue_append(cell_queue_t *queue, packed_cell_t *cell); void cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell); void append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn, - cell_t *cell, cell_direction_t direction); + cell_t *cell, cell_direction_t direction, + uint16_t fromstream); void connection_or_unlink_all_active_circs(or_connection_t *conn); int connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max, time_t now); |