[or-cvs] [tor/maint-0.2.1] Fixes to spelling fixes. Thanks, Roger!

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Date: Thu, 28 May 2009 11:54:56 -0400
Subject: Fixes to spelling fixes.  Thanks, Roger!
Commit: 260de44313a594b3f46670bd8b8a723267fda920

---
 doc/tor.1.in        |    2 +-
 src/common/crypto.c |    3 ++-
 src/or/circuituse.c |    3 ++-
 src/or/config.c     |    3 ++-
 src/or/dirvote.c    |    4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/tor.1.in b/doc/tor.1.in
index 5d11050..d857479 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -1217,7 +1217,7 @@ as an exit.)
 Authoritative directories only.  If set to 1, the directory server
 rejects all uploaded server descriptors that aren't explicitly listed
 in the fingerprints file. This acts as a "panic button" if we get
-with a Sybil attack. (Default: 0)
+hit with a Sybil attack. (Default: 0)
 .LP
 .TP
 \fBAuthDirMaxServersPerAddr\fR \fINUM\fP
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 0379826..da38ddc 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2298,7 +2298,8 @@ _openssl_locking_cb(int mode, int n, const char *file, int line)
     tor_mutex_release(_openssl_mutexes[n]);
 }
 
-/** OpenSSL helper type: wraps a Tor mutex so that OpenSSL can  */
+/** OpenSSL helper type: wraps a Tor mutex so that OpenSSL can use it
+ * as a lock. */
 struct CRYPTO_dynlock_value {
   tor_mutex_t *lock;
 };
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index bb19175..6a54c34 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -642,7 +642,8 @@ circuit_expire_old_circuits(time_t now)
     if (circ->timestamp_dirty &&
         circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now &&
         !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) {
-      log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %d secs ago, purpose %d)",
+      log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %d secs ago, "
+                "purpose %d)",
                 circ->n_circ_id, (int)(now - circ->timestamp_dirty),
                 circ->purpose);
       circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED);
diff --git a/src/or/config.c b/src/or/config.c
index 963ee10..b192ca8 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3069,7 +3069,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
     if (options->VersioningAuthoritativeDir &&
         (!options->RecommendedClientVersions ||
          !options->RecommendedServerVersions))
-      REJECT("Versioning authoritative dir servers must set Recommended*Versions.");
+      REJECT("Versioning authoritative dir servers must set "
+             "Recommended*Versions.");
     if (options->UseEntryGuards) {
       log_info(LD_CONFIG, "Authoritative directory servers can't set "
                "UseEntryGuards. Disabling.");
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 073c9e3..0156e27 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -996,8 +996,8 @@ networkstatus_compute_consensus(smartlist_t *votes,
           char dd[HEX_DIGEST_LEN+1];
           base16_encode(id, sizeof(dd), rs_out.identity_digest, DIGEST_LEN);
           base16_encode(dd, sizeof(dd), rs_out.descriptor_digest, DIGEST_LEN);
-          log_warn(LD_DIR, "The voters disagreed on the exit policy summary for"
-                   " router %s with descriptor %s.  This really shouldn't"
+          log_warn(LD_DIR, "The voters disagreed on the exit policy summary "
+                   " for router %s with descriptor %s.  This really shouldn't"
                    " have happened.", id, dd);
 
           smartlist_sort_strings(exitsummaries);
-- 
1.5.6.5