aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-01-26 10:01:34 -0500
committerNick Mathewson <nickm@torproject.org>2016-01-26 10:01:34 -0500
commit42dea56363c24960e85344749644f6502f625463 (patch)
tree8dae0aa59fcf09fe0d13aef72454205c91dca2c0 /src/or/router.c
parent0010b8064ee5bf22dae4e180fbf857548684602b (diff)
parent4339fa560934de09dbe22c7615f68ed46ba3444c (diff)
downloadtor-42dea56363c24960e85344749644f6502f625463.tar.gz
tor-42dea56363c24960e85344749644f6502f625463.zip
Merge remote-tracking branch 'teor/bug18145'
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 8cde4a1a35..741e1edb22 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2375,7 +2375,7 @@ router_new_address_suggestion(const char *suggestion,
if (tor_addr_eq(&d_conn->base_.addr, &addr)) {
/* Don't believe anybody who says our IP is their IP. */
log_debug(LD_DIR, "A directory server told us our IP address is %s, "
- "but he's just reporting his own IP address. Ignoring.",
+ "but they are just reporting their own IP address. Ignoring.",
suggestion);
return;
}