diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-22 08:58:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-22 08:58:17 -0400 |
| commit | 91467e04b18afce9af2189116ad0e160fef53e49 (patch) | |
| tree | 4ddc095a95cecec1b431899841b73e2b5a388bf7 /src/or/channelpadding.c | |
| parent | 512c57cff97c0533bbb56e6c41a1e3dca5fd9064 (diff) | |
| parent | 95a7e7e9254bc70db9e1d967d0db3deb658a2be3 (diff) | |
| download | tor-91467e04b18afce9af2189116ad0e160fef53e49.tar.gz tor-91467e04b18afce9af2189116ad0e160fef53e49.zip | |
Merge branch 'bug22805_v2_squashed'
Diffstat (limited to 'src/or/channelpadding.c')
| -rw-r--r-- | src/or/channelpadding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index ccaf5b4ec8..435436c45c 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -71,7 +71,7 @@ static int consensus_nf_pad_single_onion; * its a client, use that. Then finally verify in the consensus). */ #define CHANNEL_IS_CLIENT(chan, options) \ - (!public_server_mode((options)) || (chan)->is_client || \ + (!public_server_mode((options)) || channel_is_client(chan) || \ !connection_or_digest_is_known_relay((chan)->identity_digest)) /** |