diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-15 16:23:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-15 16:23:43 -0500 |
| commit | d6634001c9063323643e3ddfe8905c250a6d60d7 (patch) | |
| tree | 7efa13432f31719ec5b4446f4ed00d0d4d34cd51 /src/or/relay.h | |
| parent | 5fcc5dfa779fcdc84cb7249749b7fbb782f15a10 (diff) | |
| parent | 076654ce8423d2b8ab7285b22c13d4002942bd8b (diff) | |
| download | tor-d6634001c9063323643e3ddfe8905c250a6d60d7.tar tor-d6634001c9063323643e3ddfe8905c250a6d60d7.tar.gz | |
Merge remote-tracking branch 'public/wide_circ_ids'
Conflicts:
src/or/channel.h
src/or/connection_or.c
src/or/cpuworker.c
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 9e2d8af1e..7e59838f9 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -46,7 +46,8 @@ void packed_cell_free(packed_cell_t *cell); void cell_queue_clear(cell_queue_t *queue); 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 cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell, + int wide_circ_ids); void append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, cell_t *cell, cell_direction_t direction, |