commit b4b91864bb3879587edc7e8c430337f24835b28c Merge: 6bef082 c4bb3c8 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 1 20:48:15 2014 -0400

Merge remote-tracking branch 'public/bug9870'

Conflicts: src/or/config.c

changes/bug9870 | 5 +++++ src/or/config.c | 38 +++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-)

diff --cc src/or/config.c index 909ac14,dcbe88d..c42ceb3 --- a/src/or/config.c +++ b/src/or/config.c @@@ -1342,26 -1360,6 +1361,19 @@@ options_act(const or_options_t *old_opt } #endif

+ /* If we are a bridge with a pluggable transport proxy but no + Extended ORPort, inform the user that she is missing out. */ + if (server_mode(options) && options->ServerTransportPlugin && + !options->ExtORPort_lines) { + log_notice(LD_CONFIG, "We use pluggable transports but the Extended " + "ORPort is disabled. Tor and your pluggable transports proxy " + "communicate with each other via the Extended ORPort so it " + "is suggested you enable it: it will also allow your Bridge " + "to collect statistics about its clients that use pluggable " + "transports. Please enable it using the ExtORPort torrc option " + "(e.g. set 'ExtORPort auto')."); + } + - if (options->SafeLogging_ != SAFELOG_SCRUB_ALL && - (!old_options || old_options->SafeLogging_ != options->SafeLogging_)) { - log_warn(LD_GENERAL, "Your log may contain sensitive information - you " - "disabled SafeLogging. Please log safely. Don't log unless it " - "serves an important reason. Overwrite the log afterwards."); - } - if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) {