From: Yawning Angel <yawning@schwanenlied.me>
Date: Thu, 1 May 2014 03:43:53 +0000 (+0000)
Subject: Log the correct proxy type on failure.
X-Git-Tag: tor-0.2.6.1-alpha~136^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1210bdf146d707e3166c9ce881fdee67e5fa32ac;p=thirdparty%2Ftor.git

Log the correct proxy type on failure.

get_proxy_addrport fills in proxy_type with the correct value, so there
is no point in logging something that's a "best guess" based off the
config.
---

diff --git a/src/or/connection.c b/src/or/connection.c
index ff8cdf1b4a..5069ed6412 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -4841,7 +4841,7 @@ log_failed_proxy_connection(connection_t *conn)
   log_warn(LD_NET,
            "The connection to the %s proxy server at %s just failed. "
            "Make sure that the proxy server is up and running.",
-           proxy_type_to_string(get_proxy_type()),
+           proxy_type_to_string(proxy_type),
            fmt_addrport(&proxy_addr, proxy_port));
 }