[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5

[nickm at torproject.org]

commit 5f5587ee500c86d2f0ccdb808dfc90201321fdd9
Merge: ad7ffa5240 faa752f3c9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 7 08:29:23 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5

 changes/ticket33880   |  6 ++++++
 src/core/or/channel.c | 32 +++++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --cc src/core/or/channel.c
index b3a2d7122b,71cb6bccbb..3d90bef19f
--- a/src/core/or/channel.c
+++ b/src/core/or/channel.c
@@@ -771,10 -778,13 +778,12 @@@ channel_check_for_duplicates(void
  
        connections_to_relay++;
        total_relay_connections++;
+       if (is_dirauth)
+         total_dirauth_connections++;
  
 -      if (chan->is_canonical(chan, 0)) total_canonical++;
 +      if (chan->is_canonical(chan)) total_canonical++;
  
 -      if (!chan->is_canonical_to_peer && chan->is_canonical(chan, 0)
 -          && chan->is_canonical(chan, 1)) {
 +      if (!chan->is_canonical_to_peer && chan->is_canonical(chan)) {
          total_half_canonical++;
        }
      }