summaryrefslogtreecommitdiff
path: root/src/or/relay.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-10 12:46:39 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-10 12:46:39 -0500
commitca1d1c382ceb0201bf8761f2b45a0e6f8e83b9be (patch)
treec3f4f9f7a87775ce628127d81710e1a55637a0b7 /src/or/relay.h
parentd8c0c62c7b460f82dcded5eb8372b1e51fd3fbb7 (diff)
parentac9eebd63637d39b2a55d9a40c748a197fd47f93 (diff)
downloadtor-ca1d1c382ceb0201bf8761f2b45a0e6f8e83b9be.tar.gz
tor-ca1d1c382ceb0201bf8761f2b45a0e6f8e83b9be.zip
Merge remote-tracking branch 'ffmancera/github/bug24501'
Diffstat (limited to 'src/or/relay.h')
-rw-r--r--src/or/relay.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.h b/src/or/relay.h
index daf789c855..f0fa7e9870 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -17,6 +17,7 @@ extern uint64_t stats_n_relay_cells_delivered;
int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
cell_direction_t cell_direction);
+size_t cell_queues_get_total_allocation(void);
void relay_header_pack(uint8_t *dest, const relay_header_t *src);
void relay_header_unpack(relay_header_t *dest, const uint8_t *src);
@@ -114,7 +115,6 @@ STATIC int connection_edge_process_resolved_cell(edge_connection_t *conn,
STATIC packed_cell_t *packed_cell_new(void);
STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue);
STATIC destroy_cell_t *destroy_cell_queue_pop(destroy_cell_queue_t *queue);
-STATIC size_t cell_queues_get_total_allocation(void);
STATIC int cell_queues_check_size(void);
#endif /* defined(RELAY_PRIVATE) */