diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-27 22:39:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-27 22:39:46 -0500 |
| commit | a28df3fb6713043e801fb5fcf5019fc0539b5066 (patch) | |
| tree | c67fce712d60ac0ff073b0c59bb4b06e7dae04b4 /src/or/channeltls.h | |
| parent | 3d2366c676233c30133928940b4bc19d8f25f193 (diff) | |
| parent | 12b6c7df4aaf3224bc5649ef69a06dccc58ae961 (diff) | |
| download | tor-a28df3fb6713043e801fb5fcf5019fc0539b5066.tar.gz tor-a28df3fb6713043e801fb5fcf5019fc0539b5066.zip | |
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
Conflicts:
src/or/or.h
src/test/Makefile.nmake
Diffstat (limited to 'src/or/channeltls.h')
| -rw-r--r-- | src/or/channeltls.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/channeltls.h b/src/or/channeltls.h index 06be6fa555..133ad43bb4 100644 --- a/src/or/channeltls.h +++ b/src/or/channeltls.h @@ -40,8 +40,6 @@ channel_t * channel_tls_to_base(channel_tls_t *tlschan); channel_tls_t * channel_tls_from_base(channel_t *chan); /* Things for connection_or.c to call back into */ -ssize_t channel_tls_flush_some_cells(channel_tls_t *chan, ssize_t num_cells); -int channel_tls_more_to_flush(channel_tls_t *chan); void channel_tls_handle_cell(cell_t *cell, or_connection_t *conn); void channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, or_connection_t *conn, |