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

This commit is contained in:
Nick Mathewson
2014-09-11 08:59:24 -04:00
2 changed files with 10 additions and 2 deletions
+2 -2
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