diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-28 20:55:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-28 20:55:03 -0400 |
| commit | b0a7e0d6ca45bef3c5836d9082dcc9461cee6c9c (patch) | |
| tree | eed0864f80d4eba41916c614d4b8dab1cf8b97b1 /src/or/circuitbuild.c | |
| parent | 9d67d16c6a99c662f0fe81068f66de471b39a616 (diff) | |
| parent | 4010427b519c3727351905bbe5a75e85a055dd58 (diff) | |
| download | tor-b0a7e0d6ca45bef3c5836d9082dcc9461cee6c9c.tar.gz tor-b0a7e0d6ca45bef3c5836d9082dcc9461cee6c9c.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c52e4715cf..04d833d87c 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -120,7 +120,7 @@ circuit_build_times_disabled(void) 0, 0, 1); int config_disabled = !get_options()->LearnCircuitBuildTimeout; int dirauth_disabled = get_options()->AuthoritativeDir; - int state_disabled = (get_or_state()->LastWritten == -1); + int state_disabled = did_last_state_file_write_fail() ? 1 : 0; if (consensus_disabled || config_disabled || dirauth_disabled || state_disabled) { |