From: Nick Mathewson Date: Mon, 9 Nov 2020 21:17:42 +0000 (-0500) Subject: Merge branch 'maint-0.4.3' into maint-0.4.4 X-Git-Tag: tor-0.4.4.6~5^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec0f000445fdc3fd7809032c763b67880a6391c4;p=thirdparty%2Ftor.git Merge branch 'maint-0.4.3' into maint-0.4.4 --- ec0f000445fdc3fd7809032c763b67880a6391c4 diff --cc src/core/or/channel.h index 82d89471b4,becb0c973a..fa4ce4f703 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@@ -735,6 -733,11 +735,9 @@@ int channel_is_outgoing(channel_t *chan void channel_mark_client(channel_t *chan); void channel_clear_client(channel_t *chan); int channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info); + int channel_remote_identity_matches(const channel_t *chan, + const char *rsa_id_digest, + const ed25519_public_key_t *ed_id); -int channel_matches_target_addr_for_extend(channel_t *chan, - const tor_addr_t *target); unsigned int channel_num_circuits(channel_t *chan); MOCK_DECL(void,channel_set_circid_type,(channel_t *chan, crypto_pk_t *identity_rcvd,