[tor-commits] [tor/master] merge in some fixes i found in a sandbox

[arma@xxxxxxxxxxxxxx]

commit df78a2730cda08bcf4021b84ef301d58ba1f391a
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Wed Oct 17 13:56:41 2018 -0400

    merge in some fixes i found in a sandbox
---
 ChangeLog                  | 4 ++--
 ReleaseNotes               | 4 ++--
 src/feature/hs/hs_cache.c  | 6 +++---
 src/feature/hs/hs_client.c | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d2a616660..df8e57c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1252,7 +1252,7 @@ Changes in version 0.3.4.6-rc - 2018-08-06
   o Minor bugfixes (correctness, flow control):
     - Upon receiving a stream-level SENDME cell, verify that our window
       has not grown too large. Fixes bug 26214; bugfix on svn
-      r54 (pre-0.0.1)
+      r54 (pre-0.0.1).
 
   o Minor bugfixes (memory, correctness):
     - Fix a number of small memory leaks identified by coverity. Fixes
@@ -2366,7 +2366,7 @@ Changes in version 0.3.4.1-alpha - 2018-05-17
       once had an ed25519 key associated with their RSA key to always
       have that key, instead of allowing them to drop back to a version
       that didn't support ed25519. This means they need to use a new RSA
-      key if the want to downgrade to an older version of tor without
+      key if they want to downgrade to an older version of tor without
       ed25519. Closes ticket 20522.
 
   o Documentation:
diff --git a/ReleaseNotes b/ReleaseNotes
index ac107b7f3..dd7e82321 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -692,7 +692,7 @@ Changes in version 0.3.4.8 - 2018-09-10
   o Minor bugfixes (correctness, flow control):
     - Upon receiving a stream-level SENDME cell, verify that our window
       has not grown too large. Fixes bug 26214; bugfix on svn
-      r54 (pre-0.0.1)
+      r54 (pre-0.0.1).
 
   o Minor bugfixes (directory authority):
     - When voting for recommended versions, make sure that all of the
@@ -937,7 +937,7 @@ Changes in version 0.3.4.8 - 2018-09-10
       once had an ed25519 key associated with their RSA key to always
       have that key, instead of allowing them to drop back to a version
       that didn't support ed25519. This means they need to use a new RSA
-      key if the want to downgrade to an older version of tor without
+      key if they want to downgrade to an older version of tor without
       ed25519. Closes ticket 20522.
 
   o Removed features:
diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c
index 58bb10b19..b9bcb446a 100644
--- a/src/feature/hs/hs_cache.c
+++ b/src/feature/hs/hs_cache.c
@@ -467,7 +467,7 @@ cache_intro_state_free_(hs_cache_intro_state_t *state)
   tor_free(state);
 }
 
-/* Helper function: use by the free all function. */
+/* Helper function: used by the free all function. */
 static void
 cache_intro_state_free_void(void *state)
 {
@@ -488,7 +488,7 @@ cache_client_intro_state_new(void)
   FREE_AND_NULL(hs_cache_client_intro_state_t,          \
                 cache_client_intro_state_free_, (val))
 
-/* Free a cache client intro state object. */
+/* Free a cache_client_intro_state object. */
 static void
 cache_client_intro_state_free_(hs_cache_client_intro_state_t *cache)
 {
@@ -499,7 +499,7 @@ cache_client_intro_state_free_(hs_cache_client_intro_state_t *cache)
   tor_free(cache);
 }
 
-/* Helper function: use by the free all function. */
+/* Helper function: used by the free all function. */
 static void
 cache_client_intro_state_free_void(void *entry)
 {
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index 31837c5a9..11e24a366 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -265,7 +265,7 @@ retry_all_socks_conn_waiting_for_desc(void)
     }
     /* In this loop, we will possibly try to fetch a descriptor for the
      * pending connections because we just got more directory information.
-     * However, the refetch process can cleanup all SOCKS request so the same
+     * However, the refetch process can cleanup all SOCKS request to the same
      * service if an internal error happens. Thus, we can end up with closed
      * connections in our list. */
     if (base_conn->marked_for_close) {

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits