aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-17 11:09:54 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-17 11:09:54 -0400
commitd6a2fec05ebcc39773a2f6666e1378410c64f047 (patch)
treec962faa2f33eede043d67419e0cfbba80a3b8653 /src/or/circuitbuild.c
parentff5eb7fc625374c29944b9ab7160b86559ce90a4 (diff)
parent548d14247e3c8a48e2efb2ca62ee7a05fca843ba (diff)
downloadtor-d6a2fec05ebcc39773a2f6666e1378410c64f047.tar.gz
tor-d6a2fec05ebcc39773a2f6666e1378410c64f047.zip
Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index a5a933e6b0..820724adea 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -984,7 +984,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ)
}
control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED");
clear_broken_connection_map(1);
- if (server_mode(options) && !check_whether_orport_reachable()) {
+ if (server_mode(options) && !check_whether_orport_reachable(options)) {
inform_testing_reachability();
consider_testing_reachability(1, 1);
}