summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-11-25 09:08:15 -0500
committerNick Mathewson <nickm@torproject.org>2015-11-25 09:08:15 -0500
commit45caeec9a03d7caca13ef4d6caeda23f7bb3129e (patch)
tree16bf6c62b791ccc932c193fd6b5662721bf87d4b /src/or/config.c
parentab1bc38d5ae28be7666a2b896d45aebe3ec5ce4b (diff)
parent5b2adfb3d431b8f39cbddbd530840cacbb9b5ce5 (diff)
downloadtor-45caeec9a03d7caca13ef4d6caeda23f7bb3129e.tar.gz
tor-45caeec9a03d7caca13ef4d6caeda23f7bb3129e.zip
Merge remote-tracking branch 'teor/comments-20151123'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 90284147f4..290bf3db6f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5802,9 +5802,9 @@ warn_nonlocal_ext_orports(const smartlist_t *ports, const char *portname)
} SMARTLIST_FOREACH_END(port);
}
-/** Given a list of port_cfg_t in <b>ports</b>, warn any controller port there
- * is listening on any non-loopback address. If <b>forbid_nonlocal</b> is
- * true, then emit a stronger warning and remove the port from the list.
+/** Given a list of port_cfg_t in <b>ports</b>, warn if any controller port
+ * there is listening on any non-loopback address. If <b>forbid_nonlocal</b>
+ * is true, then emit a stronger warning and remove the port from the list.
*/
static void
warn_nonlocal_controller_ports(smartlist_t *ports, unsigned forbid_nonlocal)