summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-05 19:10:08 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-05 19:10:08 -0400
commit78196c8822ec8dda5df95428dbb4ae96ec4d2b7f (patch)
tree8951cb4cbb699b49b80dbf75ce27e3f55f002cc8 /src/or/control.c
parentdfa41ac0f32729f9d5a731681d826ec3006f6fb5 (diff)
parent514f0041d190b9e142cc246e3ec7ac65342547bd (diff)
downloadtor-78196c8822ec8dda5df95428dbb4ae96ec4d2b7f.tar.gz
tor-78196c8822ec8dda5df95428dbb4ae96ec4d2b7f.zip
Merge remote-tracking branch 'teor/bug18456'
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index d3613d8d4f..ea7d7b7962 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3025,7 +3025,7 @@ static const getinfo_item_t getinfo_items[] = {
" ExitPolicyRejectPrivate."),
ITEM("exit-policy/reject-private/relay", policies,
"The relay-specific rules appended to the configured exit policy by"
- " ExitPolicyRejectPrivate."),
+ " ExitPolicyRejectPrivate and/or ExitPolicyRejectLocalInterfaces."),
ITEM("exit-policy/full", policies, "The entire exit policy of onion router"),
ITEM("exit-policy/ipv4", policies, "IPv4 parts of exit policy"),
ITEM("exit-policy/ipv6", policies, "IPv6 parts of exit policy"),