diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/or/channel.c | 2 | ||||
| -rw-r--r-- | src/or/config.c | 6 |
3 files changed, 6 insertions, 6 deletions
@@ -5347,7 +5347,7 @@ Changes in version 0.2.9.2-alpha - 2016-08-24 o Deprecated features: - A number of DNS-cache-related sub-options for client ports are now deprecated for security reasons, and may be removed in a future - version of Tor. (We believe that client-side DNS cacheing is a bad + version of Tor. (We believe that client-side DNS caching is a bad idea for anonymity, and you should not turn it on.) The options are: CacheDNS, CacheIPv4DNS, CacheIPv6DNS, UseDNSCache, UseIPv4Cache, and UseIPv6Cache. @@ -11347,7 +11347,7 @@ Changes in version 0.2.4.12-alpha - 2013-04-18 0.2.0.10-alpha. Reported pseudonymously. - Make the format and order of STREAM events for DNS lookups consistent among the various ways to launch DNS lookups. Fixes - bug 8203; bugfix on 0.2.0.24-rc. Patch by "Desoxy." + bug 8203; bugfix on 0.2.0.24-rc. Patch by "Desoxy". - Correct our check for which versions of Tor support the EXTEND2 cell. We had been willing to send it to Tor 0.2.4.7-alpha and later, when support was really added in version 0.2.4.8-alpha. diff --git a/src/or/channel.c b/src/or/channel.c index 845fc3cb44..345a90a004 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1917,7 +1917,7 @@ channel_do_open_actions(channel_t *chan) CHANNELPADDING_SOS_PARAM, CHANNELPADDING_SOS_DEFAULT, 0, 1)) { /* Disable if we're using RSOS and the consensus disabled padding - * for RSOS*/ + * for RSOS */ channelpadding_disable_padding_on_channel(chan); } else if (get_options()->ReducedConnectionPadding) { /* Padding can be forced and/or reduced by clients, regardless of if diff --git a/src/or/config.c b/src/or/config.c index 4b0a59fdf7..796c15d9f7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3279,7 +3279,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->Nickname == NULL) { if (server_mode(options)) { - options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME); + options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME); } } else { if (!is_legal_nickname(options->Nickname)) { @@ -3299,9 +3299,9 @@ options_validate(or_options_t *old_options, or_options_t *options, /* Special case on first boot if no Log options are given. */ if (!options->Logs && !options->RunAsDaemon && !from_setconf) { if (quiet_level == 0) - config_line_append(&options->Logs, "Log", "notice stdout"); + config_line_append(&options->Logs, "Log", "notice stdout"); else if (quiet_level == 1) - config_line_append(&options->Logs, "Log", "warn stdout"); + config_line_append(&options->Logs, "Log", "warn stdout"); } /* Validate the tor_log(s) */ |