diff options
| author | Roger Dingledine <arma@torproject.org> | 2018-10-17 13:56:41 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2018-10-17 13:56:41 -0400 |
| commit | df78a2730cda08bcf4021b84ef301d58ba1f391a (patch) | |
| tree | 35a8412c15a59812c7e9b120b90602902950dd17 /src/feature | |
| parent | 1a3fbba92bace91588d9548f1dec5e919f97e8c2 (diff) | |
| download | tor-df78a2730cda08bcf4021b84ef301d58ba1f391a.tar.gz tor-df78a2730cda08bcf4021b84ef301d58ba1f391a.zip | |
merge in some fixes i found in a sandbox
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/hs/hs_cache.c | 6 | ||||
| -rw-r--r-- | src/feature/hs/hs_client.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index 58bb10b194..b9bcb446a1 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 31837c5a92..11e24a3660 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) { |