[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera-1/bug18918'

[nickm at torproject.org]

commit d9804691dfb507623d3c4bec56235ff7171ca17b
Merge: 92a42f795 3dd2c1d02
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 15 21:00:10 2018 -0500

    Merge remote-tracking branch 'ffmancera-1/bug18918'

 changes/bug18918      |   6 +++
 src/or/circuitbuild.c |   4 +-
 src/or/circuituse.c   |   2 +-
 src/or/main.c         |   4 +-
 src/or/router.c       | 127 ++++++++++++++++++++++++++++----------------------
 src/or/router.h       |   2 +-
 6 files changed, 83 insertions(+), 62 deletions(-)

diff --cc src/or/main.c
index aea781a0f,9a4aa01ef..24594adda
--- a/src/or/main.c
+++ b/src/or/main.c
@@@ -2064,8 -2061,8 +2064,8 @@@ check_for_reachability_bw_callback(time
    if (server_mode(options) &&
        (have_completed_a_circuit() || !any_predicted_circuits(now)) &&
        !net_is_disabled()) {
 -    if (stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {
 +    if (get_uptime() < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {
-       consider_testing_reachability(1, dirport_reachability_count==0);
+       router_do_reachability_checks(1, dirport_reachability_count==0);
        if (++dirport_reachability_count > 5)
          dirport_reachability_count = 0;
        return 1;