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

[asn at torproject.org]

commit c591a0d2466cdc644fd82519f6f1ec32da764287
Merge: 2f708079cd 8e9edb93be
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Aug 12 13:23:33 2020 +0300

    Merge branch 'maint-0.4.4'

 changes/ticket40081        |  6 ++++++
 src/core/or/channel.c      | 46 +++++++---------------------------------------
 src/core/or/channel.h      |  9 +++------
 src/core/or/channeltls.c   | 32 ++++++++++----------------------
 src/core/or/circuitbuild.c |  2 ++
 src/test/test_channel.c    | 12 +++++-------
 6 files changed, 33 insertions(+), 74 deletions(-)

diff --cc src/core/or/channeltls.c
index ae60038c34,56552f0095..51b772728e
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@@ -103,13 -102,14 +103,13 @@@ static void channel_tls_close_method(ch
  static const char * channel_tls_describe_transport_method(channel_t *chan);
  static void channel_tls_free_method(channel_t *chan);
  static double channel_tls_get_overhead_estimate_method(channel_t *chan);
 -static int
 -channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out);
 +static int channel_tls_get_remote_addr_method(const channel_t *chan,
 +                                              tor_addr_t *addr_out);
  static int
  channel_tls_get_transport_name_method(channel_t *chan, char **transport_out);
 -static const char *
 -channel_tls_get_remote_descr_method(channel_t *chan, int flags);
 +static const char *channel_tls_describe_peer_method(const channel_t *chan);
  static int channel_tls_has_queued_writes_method(channel_t *chan);
- static int channel_tls_is_canonical_method(channel_t *chan, int req);
+ static int channel_tls_is_canonical_method(channel_t *chan);
  static int
  channel_tls_matches_extend_info_method(channel_t *chan,
                                         extend_info_t *extend_info);