diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-11-09 16:13:24 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-11-09 16:13:24 -0500 |
commit | 52e439c13eac6982a605c698c49629b1da48563d (patch) | |
tree | 6f557f261a53a531d5dd83b1c44e9fc097f5305d /src/core/or/channel.c | |
parent | dd63b972883f6c0b23ee2f7661b7897b229dd28f (diff) | |
parent | afb6ff17390cb13780c6e813ad0535048dbd9d3c (diff) | |
download | tor-52e439c13eac6982a605c698c49629b1da48563d.tar.gz tor-52e439c13eac6982a605c698c49629b1da48563d.zip |
Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
Diffstat (limited to 'src/core/or/channel.c')
-rw-r--r-- | src/core/or/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 3d90bef19f..9649bdf278 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -664,7 +664,7 @@ channel_find_by_global_id(uint64_t global_identifier) /** Return true iff <b>chan</b> matches <b>rsa_id_digest</b> and <b>ed_id</b>. * as its identity keys. If either is NULL, do not check for a match. */ -static int +int channel_remote_identity_matches(const channel_t *chan, const char *rsa_id_digest, const ed25519_public_key_t *ed_id) |