diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-12 11:10:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-12 11:10:51 -0400 |
| commit | df836b45b068ecf4116c7b56898a3786893bce82 (patch) | |
| tree | e2ac9d8b1644cf88e272f3c6b612f6389c77ac17 | |
| parent | def0cac3ee229b65ede6e5bfecf0326cdeca02df (diff) | |
| parent | cc1bb19d56bd1ab1c421a89a8ceb72efe5090b0a (diff) | |
| download | tor-df836b45b068ecf4116c7b56898a3786893bce82.tar.gz tor-df836b45b068ecf4116c7b56898a3786893bce82.zip | |
Merge remote-tracking branch 'asn/bug5018_notice'
| -rw-r--r-- | changes/bug5018 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug5018 b/changes/bug5018 new file mode 100644 index 0000000000..858a8bc0cd --- /dev/null +++ b/changes/bug5018 @@ -0,0 +1,4 @@ + o Minor features: + - Don't log at warning severity when we refuse to launch a + pluggable transport proxy that we don't need. Resolves ticket + 5018. diff --git a/src/or/config.c b/src/or/config.c index 0187caf104..0da4877a5c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4682,8 +4682,8 @@ parse_client_transport_line(const char *line, int validate_only) if (is_managed) { /* managed */ if (!validate_only && is_useless_proxy) { - log_warn(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " - "any needed transports and will not be launched.", line); + log_notice(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " + "any needed transports and will not be launched.", line); } /* If we are not just validating, use the rest of the line as the |