Revised how we handle ClientTransportPlugin and Bridge lines.

Multiple Bridge lines can point to the same one ClientTransportPlugin
line, and we can have multiple ClientTransportPlugin lines in our
configuration file that don't match with a bridge. We also issue a
warning when we have a Bridge line with a pluggable transport but we
can't match it to a ClientTransportPlugin line.

1 files changed, 1 insertions, 2 deletions

diff --git a/src/or/connection.h b/src/or/connection.h
index 34be9cc215..bf439b9bbc 100644
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -58,9 +58,8 @@ int connection_connect(connection_t *conn, const char *address,
 int connection_proxy_connect(connection_t *conn, int type);
 int connection_read_proxy_handshake(connection_t *conn);
 void log_failed_proxy_connection(connection_t *conn);
-int get_proxy_addrport(int proxy_type, tor_addr_t *addr,
+int get_proxy_addrport(tor_addr_t *addr,
                        uint16_t *port, connection_t *conn);
-int get_proxy_type(void);
 
 int retry_all_listeners(smartlist_t *replaced_conns,
                         smartlist_t *new_conns);