diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-13 12:50:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-13 12:50:55 -0500 |
| commit | d8b7dcca8de8894c147571dd3e259f00a708e348 (patch) | |
| tree | 2ed308a140363a95b1070756b6c081b8185403ad /src/or/relay.c | |
| parent | 732c885b32477513b6ef374620dec32c54eb2d9c (diff) | |
| parent | 066acaf6b9e5c38fc392e85c14457f338d3c1dff (diff) | |
| download | tor-d8b7dcca8de8894c147571dd3e259f00a708e348.tar.gz tor-d8b7dcca8de8894c147571dd3e259f00a708e348.zip | |
Merge remote-tracking branch 'andrea/ticket12585_v3'
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 725a14b1a6..d491e37024 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1327,8 +1327,8 @@ connection_edge_process_relay_cell_not_open( return 0; } - if ((family == AF_INET && ! entry_conn->ipv4_traffic_ok) || - (family == AF_INET6 && ! entry_conn->ipv6_traffic_ok)) { + if (((family == AF_INET && ! entry_conn->ipv4_traffic_ok) || + (family == AF_INET6 && ! entry_conn->ipv6_traffic_ok))) { log_fn(LOG_PROTOCOL_WARN, LD_APP, "Got a connected cell to %s with unsupported address family." " Closing.", fmt_addr(&addr)); |