aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-06-28 15:52:57 -0400
committerNick Mathewson <nickm@torproject.org>2012-06-28 15:52:57 -0400
commit19a81ef02026f7422e561032a6c2d5077a22488e (patch)
treeba061aa8588474fb84b978d1ef789ad6cc79c9fc /src/common
parente62ea8fd1e1e1704d299bf27a4b507b38b071c76 (diff)
parent81cd3d7ad641a8dbf1076e011d209cfc3d6af2b0 (diff)
downloadtor-19a81ef02026f7422e561032a6c2d5077a22488e.tar.gz
tor-19a81ef02026f7422e561032a6c2d5077a22488e.zip
Merge commit '81cd3d7ad641a8dbf'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/util.c2
1 files changed, 1 insertions, 1 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)