summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@gmail.com>2011-06-14 03:27:07 +0200
committerGeorge Kadianakis <desnacked@gmail.com>2011-06-14 03:27:07 +0200
commitabe03f494321c985f5909558b5b476269982a894 (patch)
treec2b89064ecbb1ff2e8e8207ae96ae2dd0ce48d58 /src/or/main.c
parenta79bea40d84fd369ef4df950765afc4c635f9b31 (diff)
downloadtor-abe03f494321c985f5909558b5b476269982a894.tar.gz
tor-abe03f494321c985f5909558b5b476269982a894.zip
Our warning now is much more specific, mentioning proxy type/addr/port.
Not included in the previous commit, because the implementation is ugly; I see no other way of doing this though.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 09d35ed46f..f456b03d74 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -761,11 +761,8 @@ conn_close_if_marked(int i)
/* If the connection we are about to close was trying to connect to
a proxy server and failed, the client won't be able to use that
proxy. We should warn him about this. */
- if (conn->proxy_state == PROXY_INFANT) {
- log_warn(LD_NET,
- "The connection to a configured proxy server just failed. "
- "Make sure that the proxy server is up and running.");
- }
+ if (conn->proxy_state == PROXY_INFANT)
+ log_failed_proxy_connection(conn);
IF_HAS_BUFFEREVENT(conn, goto unlink);
if ((SOCKET_OK(conn->s) || conn->linked_conn) &&