Merge remote-tracking branch 'asn/bug6788'

This commit is contained in:
Nick Mathewson 2012-09-07 10:51:38 -04:00
commit 3fe2161d28

View File

@ -137,8 +137,6 @@ 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);