Various trivial changes.

* Improved function documentation.
* Renamed find_bridge_transport_by_addrport() to
  find_transport_by_bridge_addrport().
* Sanitized log severities we use.
* Ran check-spaces.

1 files changed, 5 insertions, 6 deletions

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 7cfe2e7689..cca7c9f8e9 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -335,11 +335,11 @@ connection_or_finished_connecting(or_connection_t *or_conn)
     proxy_type = PROXY_SOCKS4;
   else if (get_options()->Socks5Proxy)
     proxy_type = PROXY_SOCKS5;
-  else if (get_options()->UseBridges) {
+  else if (get_options()->ClientTransportPlugin) {
     transport_info_t *transport;
-    transport = find_bridge_transport_by_addrport(&conn->addr,conn->port);
+    transport = find_transport_by_bridge_addrport(&conn->addr,conn->port);
     if (transport) { /* this bridge supports transports. use proxy. */
-      log_warn(LD_GENERAL, "Setting up pluggable transport plugin proxy type!\n");
+      log_debug(LD_GENERAL, "Found transport. Setting proxy type!\n");
       proxy_type = transport->socks_version;
     }
   }
@@ -871,10 +871,9 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,
     port = options->Socks5ProxyPort;
   } else if (options->ClientTransportPlugin) {
     transport_info_t *transport;
-    transport = find_bridge_transport_by_addrport(&addr, port);
+    transport = find_transport_by_bridge_addrport(&addr, port);
     if (transport) {
-      log_warn(LD_GENERAL, "Our bridge uses a pluggable transport plugin. "
-               "Setting up proxying!");
+      log_debug(LD_GENERAL, "Found transport. Setting up proxying!");
       using_proxy = 1;
       tor_addr_copy(&addr, &transport->addr);
       port = transport->port;