diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 11:10:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 11:10:20 -0400 |
| commit | 6382cd93cb99d1f5cff62bfe7759eca8a6948782 (patch) | |
| tree | db86f11cd30f2fa8314fc60bfd464ebcc3940dca /src/or/circuituse.c | |
| parent | 49c83dd21a7fe0432ad78061f3b41f4a5919340d (diff) | |
| parent | d6a2fec05ebcc39773a2f6666e1378410c64f047 (diff) | |
| download | tor-6382cd93cb99d1f5cff62bfe7759eca8a6948782.tar.gz tor-6382cd93cb99d1f5cff62bfe7759eca8a6948782.zip | |
Merge branch '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 246f6c50c9..539056f280 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, |