aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-06-14 11:01:04 -0400
committerNick Mathewson <nickm@torproject.org>2014-06-14 11:01:04 -0400
commita58d94fb7c6c304ecba930eaa7ebbade1d0686ab (patch)
tree7c36b6a4f13246cec4644ebebba223f774c7dcbf /src/or/relay.h
parentcfca2a6037c139a82677a0ba2776d4ddf6ca6d04 (diff)
parent8f3e3279c198dd13c11ffd739ddf08dbe8b07762 (diff)
downloadtor-a58d94fb7c6c304ecba930eaa7ebbade1d0686ab.tar
tor-a58d94fb7c6c304ecba930eaa7ebbade1d0686ab.tar.gz
Merge branch 'bug12184_diagnostic_squashed'
Diffstat (limited to 'src/or/relay.h')
-rw-r--r--src/or/relay.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/relay.h b/src/or/relay.h
index 479d474b3..969c6fb61 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -82,6 +82,8 @@ void stream_choice_seed_weak_rng(void);
int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction,
crypt_path_t **layer_hint, char *recognized);
+circid_t packed_cell_get_circid(const packed_cell_t *cell, int wide_circ_ids);
+
#ifdef RELAY_PRIVATE
STATIC int connected_cell_parse(const relay_header_t *rh, const cell_t *cell,
tor_addr_t *addr_out, int *ttl_out);