Merge commit 'origin/maint-0.2.1'

5 files changed, 8 insertions, 6 deletions

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 92e0746369..a2110a4da4 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 eaa875043e..0cf0db7578 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 073c9e3aa6..0156e273be 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);
diff --git a/src/or/or.h b/src/or/or.h
index 70f5e0d63b..0d906e0870 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2818,7 +2818,7 @@ void circuit_build_failed(origin_circuit_t *circ);
 #define CIRCLAUNCH_ONEHOP_TUNNEL  (1<<0)
 /** Flag to set when a circuit needs to be built of high-uptime nodes */
 #define CIRCLAUNCH_NEED_UPTIME    (1<<1)
-/** Flag to set when a circuit needs to be build of high-capacity nodes */
+/** Flag to set when a circuit needs to be built of high-capacity nodes */
 #define CIRCLAUNCH_NEED_CAPACITY  (1<<2)
 /** Flag to set when the last hop of a circuit doesn't need to be an
  * exit node. */
diff --git a/src/or/relay.c b/src/or/relay.c
index 4319d77b43..4e09c0040b 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -783,7 +783,7 @@ connection_ap_process_end_not_open(
            "Edge got end (%s) before we're connected. Marking for close.",
        stream_end_reason_to_string(rh->length > 0 ? reason : -1));
   circuit_log_path(LOG_INFO,LD_APP,circ);
-  /* need to test because of detach_retryable*/
+  /* need to test because of detach_retriable */
   if (!conn->_base.marked_for_close)
     connection_mark_unattached_ap(conn, control_reason);
   return 0;