aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-21 14:15:19 +0200
committerNick Mathewson <nickm@torproject.org>2016-07-21 14:15:19 +0200
commit9c87869dde2fdae5ef624700a567c6ffc1e964c8 (patch)
tree49abbda317628ab0aa3b8e7618978e7b418d9d28
parent22314f9050851ddebd29bd63085d83f4fa5ba926 (diff)
parentf1973e70a45d9705d3bd547af9cee92ca3611213 (diff)
downloadtor-9c87869dde2fdae5ef624700a567c6ffc1e964c8.tar.gz
tor-9c87869dde2fdae5ef624700a567c6ffc1e964c8.zip
Merge branch 'maint-0.2.8'
-rw-r--r--src/common/sandbox.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 23d97dffa1..42e40c6a8f 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -606,7 +606,6 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
const int pf = i ? PF_INET : PF_INET6;
for (j=0; j < 3; ++j) {
const int type = (j == 0) ? SOCK_STREAM :
- (j == 1) ? SOCK_DGRAM :
SOCK_DGRAM;
const int protocol = (j == 0) ? IPPROTO_TCP :
(j == 1) ? IPPROTO_IP :