From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 Feb 2018 02:00:10 +0000 (-0500)
Subject: Merge remote-tracking branch 'ffmancera-1/bug18918'
X-Git-Tag: tor-0.3.4.1-alpha~272
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9804691dfb507623d3c4bec56235ff7171ca17b;p=thirdparty%2Ftor.git

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

d9804691dfb507623d3c4bec56235ff7171ca17b
diff --cc src/or/main.c
index aea781a0f2,9a4aa01ef3..24594addac
--- 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;