Browse Source

whitespace and typo fixes

Roger Dingledine 6 years ago
parent
commit
94ec5af5fe
3 changed files with 6 additions and 6 deletions
  1. 2 2
      ChangeLog
  2. 1 1
      src/or/channel.c
  3. 3 3
      src/or/config.c

+ 2 - 2
ChangeLog

@@ -5347,7 +5347,7 @@ Changes in version 0.2.9.2-alpha - 2016-08-24
   o Deprecated features:
   o Deprecated features:
     - A number of DNS-cache-related sub-options for client ports are now
     - A number of DNS-cache-related sub-options for client ports are now
       deprecated for security reasons, and may be removed in a future
       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
       idea for anonymity, and you should not turn it on.) The options
       are: CacheDNS, CacheIPv4DNS, CacheIPv6DNS, UseDNSCache,
       are: CacheDNS, CacheIPv4DNS, CacheIPv6DNS, UseDNSCache,
       UseIPv4Cache, and UseIPv6Cache.
       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.
       0.2.0.10-alpha. Reported pseudonymously.
     - Make the format and order of STREAM events for DNS lookups
     - Make the format and order of STREAM events for DNS lookups
       consistent among the various ways to launch DNS lookups. Fixes
       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
     - 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
       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.
       later, when support was really added in version 0.2.4.8-alpha.

+ 1 - 1
src/or/channel.c

@@ -1917,7 +1917,7 @@ channel_do_open_actions(channel_t *chan)
                                         CHANNELPADDING_SOS_PARAM,
                                         CHANNELPADDING_SOS_PARAM,
                                         CHANNELPADDING_SOS_DEFAULT, 0, 1)) {
                                         CHANNELPADDING_SOS_DEFAULT, 0, 1)) {
       /* Disable if we're using RSOS and the consensus disabled padding
       /* Disable if we're using RSOS and the consensus disabled padding
-       * for RSOS*/
+       * for RSOS */
       channelpadding_disable_padding_on_channel(chan);
       channelpadding_disable_padding_on_channel(chan);
     } else if (get_options()->ReducedConnectionPadding) {
     } else if (get_options()->ReducedConnectionPadding) {
       /* Padding can be forced and/or reduced by clients, regardless of if
       /* Padding can be forced and/or reduced by clients, regardless of if

+ 3 - 3
src/or/config.c

@@ -3279,7 +3279,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
 
 
   if (options->Nickname == NULL) {
   if (options->Nickname == NULL) {
     if (server_mode(options)) {
     if (server_mode(options)) {
-        options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME);
+      options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME);
     }
     }
   } else {
   } else {
     if (!is_legal_nickname(options->Nickname)) {
     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. */
   /* Special case on first boot if no Log options are given. */
   if (!options->Logs && !options->RunAsDaemon && !from_setconf) {
   if (!options->Logs && !options->RunAsDaemon && !from_setconf) {
     if (quiet_level == 0)
     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)
     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) */
   /* Validate the tor_log(s) */