diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2013-10-28 11:30:49 +0100 |
|---|---|---|
| committer | Karsten Loesing <karsten.loesing@gmx.net> | 2013-10-28 12:09:42 +0100 |
| commit | 2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4 (patch) | |
| tree | f4639f6ed8b224087e665373ba147df1fd53144d /src/or/relay.h | |
| parent | 49278cd68a0d84727ae1131e677bc3481b3e2fc7 (diff) | |
| parent | e46de82c97e694d3bfa399af48b9de9365e264bd (diff) | |
| download | tor-2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4.tar tor-2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4.tar.gz | |
Merge branch 'morestats4' into morestats5
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/connection.h
src/or/control.c
src/or/control.h
src/or/or.h
src/or/relay.c
src/or/relay.h
src/test/test.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 e1b5e381e..20eecfb40 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -54,7 +54,8 @@ void packed_cell_free(packed_cell_t *cell); void cell_queue_init(cell_queue_t *queue); 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(circuit_t *circ, cell_queue_t *queue, + int exitward, const cell_t *cell, int wide_circ_ids, int use_stats); void append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, |