aboutsummaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
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/or/networkstatus.c
parente86ad6b7fb49a497fa75b79bc15d004b02ebd371 (diff)
parentd49711e52c22e77e95c30660f78b19d4f6025d04 (diff)
downloadtor-cb18fc2190ce909a9256849f9b141148177d4dd4.tar.gz
tor-cb18fc2190ce909a9256849f9b141148177d4dd4.zip
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r--src/or/networkstatus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 54ccb113ce..573197a53f 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -947,7 +947,7 @@ router_get_consensus_status_by_nickname(const char *nickname,
});
if (any_unwarned) {
log_warn(LD_CONFIG,"There are multiple matches for the nickname \"%s\","
- " but none is listed as named by the directory authorites. "
+ " but none is listed as named by the directory authorities. "
"Choosing one arbitrarily.", nickname);
}
} else if (warn_if_unnamed && best && !best->name_lookup_warned) {