[tor-commits] [tor/master] Merge branch 'ticket40282_046_01_squashed'

[nickm at torproject.org]

commit 4321755de7d4603561369537f6f7c11cefa49262
Merge: 8907800549 1c45a3df7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 23 08:32:58 2021 -0500

    Merge branch 'ticket40282_046_01_squashed'

 changes/ticket40282                |   6 ++
 doc/man/tor.1.txt                  |   7 ++
 src/core/mainloop/mainloop.c       |   2 +-
 src/core/or/circuitbuild.c         |   2 +-
 src/core/or/circuituse.c           |   5 +-
 src/feature/dirclient/dirclient.c  |  23 -----
 src/feature/relay/relay_periodic.c |  18 +---
 src/feature/relay/router.c         |   4 +-
 src/feature/relay/selftest.c       | 174 ++++++++-----------------------------
 src/feature/relay/selftest.h       |  13 ++-
 src/feature/stats/predict_ports.c  |   2 -
 src/test/test_options.c            |  43 ---------
 12 files changed, 60 insertions(+), 239 deletions(-)

diff --cc src/feature/relay/selftest.c
index 062b2780e7,66e5db34dd..e4ee524621
--- a/src/feature/relay/selftest.c
+++ b/src/feature/relay/selftest.c
@@@ -137,16 -128,9 +130,9 @@@ router_orport_seems_reachable(const or_
    return true;
  }
  
- /** Return 0 if we need to do a DirPort reachability check, because:
-  *   - no reachability check has been done yet, or
-  *   - we've initiated reachability checks, but none have succeeded.
-  *  Return 1 if we don't need to do a DirPort reachability check, because:
-  *   - we've seen a successful reachability check, or
-  *   - there is no DirPort set, or
-  *   - AssumeReachable is set, or
-  *   - We're a dir auth (see ticket #40287), or
-  *   - the network is disabled.
-  */
 -/** Relays no long open a DirPort except authorities. In both cases, no
 - * reachability self test is done anymore since network re-entry towards an
++/** Relay DirPorts are no longer used (though authorities are). In either case,
++ * reachability self test is done anymore, since network re-entry towards an
+  * authority DirPort is not allowed. Thus, consider it always reachable. */
  int
  router_dirport_seems_reachable(const or_options_t *options)
  {