Commit 260de443 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Fixes to spelling fixes. Thanks, Roger!

parent d49711e5

doc/tor.1.in

+1 −1
Original line number Diff line number Diff line
@@ -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

src/common/crypto.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

};

src/or/circuituse.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

src/or/config.c

+2 −1
Original line number Diff line number Diff line
@@ -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.");

src/or/dirvote.c

+2 −2
Original line number Diff line number Diff line
@@ -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);