diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-11 08:59:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-11 08:59:24 -0400 |
| commit | 2914d56ea4c767bbfa956afba64032c90a27f4eb (patch) | |
| tree | 5a8d5719da882aceb2ab17bd466361b24e1bd17c | |
| parent | 121f4a9ca43fa88282778adac4597fac8d9deafc (diff) | |
| parent | 6215ebb26676e3fa5d18ddce114f273d9a5dee2a (diff) | |
| download | tor-2914d56ea4c767bbfa956afba64032c90a27f4eb.tar.gz tor-2914d56ea4c767bbfa956afba64032c90a27f4eb.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
| -rw-r--r-- | changes/bug13124 | 8 | ||||
| -rw-r--r-- | src/or/config.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/changes/bug13124 b/changes/bug13124 new file mode 100644 index 0000000000..be7df70347 --- /dev/null +++ b/changes/bug13124 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Reduce the log severity of the "Pluggable transport proxy does + not provide any needed transports and will not be launched." + message, since Tor Browser includes several ClientTransportPlugin + lines in its torrc-defaults file, leading every Tor Browser user + who looks at her logs to see these notices and wonder if they're + dangerous. Resolves bug 13124; bugfix on 0.2.5.3-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 46b4afe3ae..10af92a9cf 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4846,8 +4846,8 @@ parse_client_transport_line(const or_options_t *options, if (is_managed) { /* managed */ if (!validate_only && is_useless_proxy) { - log_notice(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " - "any needed transports and will not be launched.", line); + log_info(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 |