diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 10:48:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 10:48:12 -0400 |
| commit | 548d14247e3c8a48e2efb2ca62ee7a05fca843ba (patch) | |
| tree | 461e46b28ff628235379dfa242fa44b1ca1eccfa /src/or/circuituse.c | |
| parent | 6cc3397e26ff37d6f01471b83e0e5bb1b5aa8eee (diff) | |
| parent | 06031b441eb92f575f0a1c2ac264dc0daee4fbf4 (diff) | |
| download | tor-548d14247e3c8a48e2efb2ca62ee7a05fca843ba.tar.gz tor-548d14247e3c8a48e2efb2ca62ee7a05fca843ba.zip | |
Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index a4b580104f..e43b24ca7d 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1426,7 +1426,7 @@ static void circuit_testing_opened(origin_circuit_t *circ) { if (have_performed_bandwidth_test || - !check_whether_orport_reachable()) { + !check_whether_orport_reachable(get_options())) { /* either we've already done everything we want with testing circuits, * or this testing circuit became open due to a fluke, e.g. we picked * a last hop where we already had the connection open due to an @@ -1443,7 +1443,8 @@ circuit_testing_opened(origin_circuit_t *circ) static void circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) { - if (server_mode(get_options()) && check_whether_orport_reachable()) + const or_options_t *options = get_options(); + if (server_mode(options) && check_whether_orport_reachable(options)) return; log_info(LD_GENERAL, |