summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-06 10:12:28 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-06 10:12:28 -0400
commite9684405acf5d3bbfa3c2d4f70332cef3c66d553 (patch)
tree6fb59c7aa83a0f587b20e552e189e3bfade8077f /src/or/circuitbuild.h
parentd2d7cab5b83e49aba4ae8ecf0aabb9dfcda8d31e (diff)
parent4edc57caa5c4a7d4d46d30bf0150a7f70e8dcccb (diff)
downloadtor-e9684405acf5d3bbfa3c2d4f70332cef3c66d553.tar.gz
tor-e9684405acf5d3bbfa3c2d4f70332cef3c66d553.zip
Merge remote-tracking branch 'asn/bug4567_rebased'
Diffstat (limited to 'src/or/circuitbuild.h')
-rw-r--r--src/or/circuitbuild.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index b3ebf094a8..7083db12fb 100644
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@ -137,6 +137,10 @@ const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr,
struct transport_t;
int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port,
const struct transport_t **transport);
+const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr,
+ uint16_t port);
+
+int validate_pluggable_transports_config(void);
#endif