aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/channel.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-11-09 16:17:42 -0500
committerNick Mathewson <nickm@torproject.org>2020-11-09 16:17:42 -0500
commitec0f000445fdc3fd7809032c763b67880a6391c4 (patch)
tree68cb7c590ff782ee7388f5267345abca42bdb0cc /src/core/or/channel.c
parentb0e6ec627cb76478507a746090b64c0458723460 (diff)
parent0b2c64effd7b4c1238e3b4da34f09d670dafd52d (diff)
downloadtor-ec0f000445fdc3fd7809032c763b67880a6391c4.tar.gz
tor-ec0f000445fdc3fd7809032c763b67880a6391c4.zip
Merge branch 'maint-0.4.3' into maint-0.4.4
Diffstat (limited to 'src/core/or/channel.c')
-rw-r--r--src/core/or/channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/or/channel.c b/src/core/or/channel.c
index 5ed6bb9272..9194718e3d 100644
--- a/src/core/or/channel.c
+++ b/src/core/or/channel.c
@@ -670,7 +670,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)