diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-06-13 10:31:02 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-06-13 10:31:02 -0400 |
commit | 4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d (patch) | |
tree | 81cf1e73e3ecb06333cbc22d80ab045bcea348ba /src/or/relay.h | |
parent | 29498491432040168c5df7091097a7b8a9c9ad86 (diff) | |
parent | e61df2ec651345f1c46777105bbae69916402ecd (diff) | |
download | tor-4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d.tar.gz tor-4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d.zip |
Merge remote-tracking branch 'public/bug7912_squashed'
Diffstat (limited to 'src/or/relay.h')
-rw-r--r-- | src/or/relay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.h b/src/or/relay.h index 229fb4f737..c5f0df2f0e 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -53,7 +53,7 @@ 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, - int wide_circ_ids); + int wide_circ_ids, int use_stats); void append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, cell_t *cell, cell_direction_t direction, |