[tor-commits] [tor/maint-0.2.5] Reduce log severity for unused ClientTransportPlugin lines

[nickm at torproject.org]

commit 6215ebb26676e3fa5d18ddce114f273d9a5dee2a
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Sep 11 08:02:37 2014 -0400

    Reduce log severity for unused ClientTransportPlugin lines
    
    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.
---
 changes/bug13124 |    8 ++++++++
 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 0000000..be7df70
--- /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 c4fc8dd..31a3586 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4827,8 +4827,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