aboutsummaryrefslogtreecommitdiff
path: root/src/or/entrynodes.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-04 09:49:35 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-04 09:52:04 -0500
commit9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5 (patch)
tree5741dcdf0bf425712470554a0dfb63cd54f4a2a1 /src/or/entrynodes.h
parentb1ca05d273eaef7477528c059ab0d1deb0dc9dab (diff)
parent2d4241d58482c919984f163323efb96c6f365a2d (diff)
downloadtor-9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5.tar.gz
tor-9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5.zip
Merge remote-tracking branch 'andrea/ticket6456'
Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
Diffstat (limited to 'src/or/entrynodes.h')
-rw-r--r--src/or/entrynodes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h
index 80ac5e4a1c..5416398430 100644
--- a/src/or/entrynodes.h
+++ b/src/or/entrynodes.h
@@ -154,7 +154,7 @@ struct transport_t;
int get_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port,
const struct transport_t **transport);
-int transport_is_needed(const char *transport_name);
+MOCK_DECL(int, transport_is_needed, (const char *transport_name));
int validate_pluggable_transports_config(void);
double pathbias_get_close_success_count(entry_guard_t *guard);