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

diff --cc src/core/or/channel.c
index b3a2d7122b4c23a31ada0ed3b229bce1f8e21c02,71cb6bccbbb254a1920db40b695da56e220df548..3d90bef19f80baf17a784df2ecb21bada1c71d39
--- 1/src/core/or/channel.c
--- 2/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++;
        }
      }