misc tiny fixes

diff --git a/ChangeLog b/ChangeLog
index 58d5b81e0ffc02feb0b2641d2bd2b1241bb94e40..98da35a0715b401f44ef6a8de563a072a51cd12c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Changes in version 0.3.3.4-alpha - 2018-03-29
   Tor 0.3.3.4-alpha includes various bugfixes for issues found during
   the alpha testing of earlier releases in its series. We are
-  approaching a stable 0.3.3.4-alpha release: more testing is welcome!
+  approaching a stable 0.3.3 release: more testing is welcome!
 
   o New system requirements:
     - When built with Rust, Tor now depends on version 0.2.39 of the
@@ -3905,7 +3905,7 @@ Changes in version 0.3.0.8 - 2017-06-08
   o Major bugfixes (hidden service v3, backport from 0.3.1.1-alpha):
     - Stop rejecting v3 hidden service descriptors because their size
       did not match an old padding rule. Fixes bug 22447; bugfix on
-      tor-0.3.0.1-alpha.
+      0.3.0.1-alpha.
 
   o Minor features (fallback directory list, backport from 0.3.1.3-alpha):
     - Replace the 177 fallbacks originally introduced in Tor 0.2.9.8 in

diff --git a/src/or/relay.c b/src/or/relay.c
index 5dc9d9445b82cfcc8527a9a81434e43b5f7e0b06..5651579c3eb3b9741a48202d363d7e00a2bfe7e5 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2945,7 +2945,7 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max))
 /** Add <b>cell</b> to the queue of <b>circ</b> writing to <b>chan</b>
  * transmitting in <b>direction</b>.
  *
- * The given <b>cell</b> is copied over the circuit queue so the caller must
+ * The given <b>cell</b> is copied onto the circuit queue so the caller must
  * cleanup the memory.
  *
  * This function is part of the fast path. */

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 2e5280610f562eda8752a8652f4a08700136bc29..de74fdb30d6a5e42aba54ccd960f5ae7e22732ae 100644 (file)
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -1237,7 +1237,7 @@ test_build_update_descriptors(void *arg)
     node->is_running = node->is_valid = node->is_fast = node->is_stable = 1;
   }
 
-  /* We have to set thise, or the lack of microdescriptors for these
+  /* We have to set this, or the lack of microdescriptors for these
    * nodes will make them unusable. */
   get_options_mutable()->UseMicrodescriptors = 0;