diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-28 15:52:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-28 15:52:57 -0400 |
| commit | 19a81ef02026f7422e561032a6c2d5077a22488e (patch) | |
| tree | ba061aa8588474fb84b978d1ef789ad6cc79c9fc /src | |
| parent | e62ea8fd1e1e1704d299bf27a4b507b38b071c76 (diff) | |
| parent | 81cd3d7ad641a8dbf1076e011d209cfc3d6af2b0 (diff) | |
| download | tor-19a81ef02026f7422e561032a6c2d5077a22488e.tar.gz tor-19a81ef02026f7422e561032a6c2d5077a22488e.zip | |
Merge commit '81cd3d7ad641a8dbf'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/util.c | 2 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/util.c b/src/common/util.c index 099cdd304c..4850e04d1a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4031,7 +4031,7 @@ tor_get_exit_code(const process_handle_t *process_handle, } /** Helper: return the number of characters in <b>s</b> preceding the first - * occurence of <b>ch</b>. If <b>ch</b> does not occur in <b>s</b>, return + * occurrence of <b>ch</b>. If <b>ch</b> does not occur in <b>s</b>, return * the length of <b>s</b>. Should be equivalent to strspn(s, "ch"). */ static INLINE size_t str_num_before(const char *s, char ch) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 074b78d96f..6d1e4e7643 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3503,7 +3503,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) if (state && options->UseEntryGuards && (purpose != CIRCUIT_PURPOSE_TESTING || options->BridgeRelay)) { - /* This is request for an entry server to use for a regular circuit, + /* This request is for an entry server to use for a regular circuit, * and we use entry guard nodes. Just return one of the guard nodes. */ return choose_random_entry(state); } |