nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.5'

Browse Source
This commit is contained in:
Nick Mathewson 2014-09-11 08:59:24 -04:00
commit 2914d56ea4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug13124 Normal file
View File

@ -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.

4
src/or/config.c
View File

@ -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