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

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/main.c
index aea781a0f21f0bd81a8bdc5ba611c5dcedf30736,9a4aa01ef3bb2f7715bb39b0a2e269e9e7b12f05..24594addac16956cc9f8320cee85f8464993a324
--- 1/src/or/main.c
--- 2/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;

diff --cc src/or/router.c
Simple merge