Merge branch 'maint-0.4.3' into maint-0.4.4

diff --cc src/core/or/channel.c
Simple merge

diff --cc src/core/or/channel.h
index 82d89471b489529aa4246eb9d78799479a1a75e5,becb0c973a73fc365cc0aa8a5dad7e6553ac97aa..fa4ce4f703030fe417166f7167219d02ed33d942
--- 1/src/core/or/channel.h
--- 2/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_matches_target_addr_for_extend(channel_t *chan,
 -                                           const tor_addr_t *target);
+ int channel_remote_identity_matches(const channel_t *chan,
+                                     const char *rsa_id_digest,
+                                     const ed25519_public_key_t *ed_id);
  unsigned int channel_num_circuits(channel_t *chan);
  MOCK_DECL(void,channel_set_circid_type,(channel_t *chan,
                                          crypto_pk_t *identity_rcvd,

diff --cc src/core/or/circuitbuild.c
Simple merge