diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-10-29 01:29:59 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-10-29 01:29:59 -0400 |
commit | 4b6f074df9c540cb4847793b7e8243c8f642de0a (patch) | |
tree | 3e203c80bc1e1de0a226e9d30b076ecdb8c91d0b /src/or/entrynodes.h | |
parent | 49278cd68a0d84727ae1131e677bc3481b3e2fc7 (diff) | |
parent | 2235d65240ed1624d49a79891bc5ae564a6a4f34 (diff) | |
download | tor-4b6f074df9c540cb4847793b7e8243c8f642de0a.tar.gz tor-4b6f074df9c540cb4847793b7e8243c8f642de0a.zip |
Merge remote-tracking branch 'public/bug5018'
Conflicts:
src/or/entrynodes.c
Diffstat (limited to 'src/or/entrynodes.h')
-rw-r--r-- | src/or/entrynodes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 1f8cff75a2..772c6662d3 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -123,6 +123,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); int validate_pluggable_transports_config(void); double pathbias_get_close_success_count(entry_guard_t *guard); |