commit 148b5b03a365eae7d8e527d337f9df91d6350f9b Merge: 54e6109499 afb6ff1739 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 30 10:51:20 2020 -0400

Merge branch 'bug40080_035'

changes/bug40080 | 6 ++++++ src/core/or/channel.c | 2 +- src/core/or/channel.h | 3 +++ src/core/or/circuitbuild.c | 24 ++++++++++++++++++++---- 4 files changed, 30 insertions(+), 5 deletions(-)

diff --cc src/core/or/channel.h index 206d0fdc97,4c0c9aeb4c..a1517aee37 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@@ -735,6 -741,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,