summaryrefslogtreecommitdiff
path: root/src/or/policies.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-17 16:05:09 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-17 16:05:09 -0400
commit1c64f99a1a74cac4074ddefa958fd4ae7acddcb2 (patch)
treed47ca63f67fe817a7a87fe77f88976aa8908753b /src/or/policies.c
parent63dfc1d9b6e6d488f32c99c3ffad882f6fbe0f51 (diff)
parente13e9c40c829d15fb71310b0638fff859b85580a (diff)
downloadtor-1c64f99a1a74cac4074ddefa958fd4ae7acddcb2.tar.gz
tor-1c64f99a1a74cac4074ddefa958fd4ae7acddcb2.zip
Merge remote-tracking branch 'public/bug5124'
Diffstat (limited to 'src/or/policies.c')
-rw-r--r--src/or/policies.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/policies.c b/src/or/policies.c
index 3018803bc4..798bb846fa 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -1004,8 +1004,7 @@ policy_write_item(char *buf, size_t buflen, addr_policy_t *policy,
else
addrpart = addrbuf;
- result = tor_snprintf(buf, buflen, "%s%s%s %s",
- (is_ip6&&format_for_desc)?"opt ":"",
+ result = tor_snprintf(buf, buflen, "%s%s %s",
is_accept ? "accept" : "reject",
(is_ip6&&format_for_desc)?"6":"",
addrpart);