diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-01 10:29:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-01 10:29:05 -0400 |
| commit | d018bf199c9e566202eef0bb7fb68c2567c4a25e (patch) | |
| tree | 83b81729b2c25a21bd2ef61e9350667d2fa56d7e /src/or/circuitstats.c | |
| parent | 4cf6b67f5e83e1a26b4b2fbdb3b169c137a30687 (diff) | |
| parent | d8509b450a1de815399a42b5df8c6b25789429c7 (diff) | |
| download | tor-d018bf199c9e566202eef0bb7fb68c2567c4a25e.tar.gz tor-d018bf199c9e566202eef0bb7fb68c2567c4a25e.zip | |
Merge remote-tracking branch 'dgoulet/ticket25610_034_01-squashed'
Diffstat (limited to 'src/or/circuitstats.c')
| -rw-r--r-- | src/or/circuitstats.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 6438319273..6015bcf851 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -35,6 +35,7 @@ #include "networkstatus.h" #include "rendclient.h" #include "rendservice.h" +#include "router.h" #include "statefile.h" #include "circuitlist.h" #include "circuituse.h" @@ -125,7 +126,7 @@ circuit_build_times_disabled_(const or_options_t *options, ignore_consensus ? 0 : networkstatus_get_param(NULL, "cbtdisabled", 0, 0, 1); int config_disabled = !options->LearnCircuitBuildTimeout; - int dirauth_disabled = options->AuthoritativeDir; + int dirauth_disabled = authdir_mode(options); int state_disabled = did_last_state_file_write_fail() ? 1 : 0; /* LearnCircuitBuildTimeout and Tor2web/Single Onion Services are * incompatible in two ways: |