aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-10 14:08:29 -0400
committerNick Mathewson <nickm@torproject.org>2014-03-10 14:08:29 -0400
commit0c04416c11d79e8dc5fc9def6ea337f75526e397 (patch)
tree6ae80471a420b7bad7955e3f6db3826877ba8541
parent1365ff5b9a04a7da2acc2e52df18a61b6cb39fe6 (diff)
parent8c8e21e296548e232fc6d39022f48b6bb0e4709d (diff)
downloadtor-0c04416c11d79e8dc5fc9def6ea337f75526e397.tar
tor-0c04416c11d79e8dc5fc9def6ea337f75526e397.tar.gz
Merge branch 'bug11043_take2_squashed'
-rw-r--r--changes/bug110435
-rw-r--r--src/or/config.c25
2 files changed, 19 insertions, 11 deletions
diff --git a/changes/bug11043 b/changes/bug11043
new file mode 100644
index 000000000..cdf534da8
--- /dev/null
+++ b/changes/bug11043
@@ -0,0 +1,5 @@
+ o Minor features (log messages):
+ - Improve the message that gets displayed when Tor as a bridge is
+ using pluggable transports but doesn't have an Extended ORPort
+ listener. Furthermore, we now log the message in the log file
+ too. Resolves ticket 11043.
diff --git a/src/or/config.c b/src/or/config.c
index c822a8475..0187caf10 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1343,6 +1343,20 @@ options_act(const or_options_t *old_options)
}
#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 "
@@ -3272,17 +3286,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
smartlist_free(options_sl);
}
- /* 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 are a bridge with a pluggable transport "
- "proxy but the Extended ORPort is disabled. The "
- "Extended ORPort helps Tor communicate with the pluggable "
- "transport proxy. Please enable it using the ExtORPort "
- "torrc option.");
- }
-
if (options->ConstrainedSockets) {
/* If the user wants to constrain socket buffer use, make sure the desired
* limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */