summaryrefslogtreecommitdiff
path: root/src/common/ht.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-05-27 18:12:18 -0400
committerNick Mathewson <nickm@torproject.org>2009-05-27 18:12:18 -0400
commitcb18fc2190ce909a9256849f9b141148177d4dd4 (patch)
tree42e2aca11768f5772128b9e504eacc10c779bc89 /src/common/ht.h
parente86ad6b7fb49a497fa75b79bc15d004b02ebd371 (diff)
parentd49711e52c22e77e95c30660f78b19d4f6025d04 (diff)
downloadtor-cb18fc2190ce909a9256849f9b141148177d4dd4.tar.gz
tor-cb18fc2190ce909a9256849f9b141148177d4dd4.zip
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/common/ht.h')
-rw-r--r--src/common/ht.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/ht.h b/src/common/ht.h
index be747529ab..5187c90e6f 100644
--- a/src/common/ht.h
+++ b/src/common/ht.h
@@ -430,7 +430,7 @@ ht_string_hash(const char *s)
/*
* Copyright 2005, Nick Mathewson. Implementation logic is adapted from code
- * by Cristopher Clark, retrofit to allow drop-in memory management, and to
+ * by Christopher Clark, retrofit to allow drop-in memory management, and to
* use the same interface as Niels Provos's HT_H. I'm not sure whether this
* is a derived work any more, but whether it is or not, the license below
* applies.