Merge remote-tracking branch 'asn/bug5018_notice'

This commit is contained in:
Nick Mathewson
2014-03-12 11:10:51 -04:00
2 changed files with 6 additions and 2 deletions
+4
View File
@@ -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.
+2 -2
View File
@@ -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