[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

[nickm@xxxxxxxxxxxxxx]

commit ec0f000445fdc3fd7809032c763b67880a6391c4
Merge: b0e6ec627c 0b2c64effd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 9 16:17:42 2020 -0500

    Merge branch 'maint-0.4.3' into maint-0.4.4

 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 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,



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits