diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-04 15:51:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-04 15:54:05 -0400 |
| commit | 4f3dbb3c0a5c1a6d7d8571add3722e6c567e3d81 (patch) | |
| tree | 27223037f82a6610c2119ba47f85768d001758d4 /src/or/circuitbuild.c | |
| parent | 8611195a005ed1624bdea0632404a8c00bb19586 (diff) | |
| download | tor-4f3dbb3c0a5c1a6d7d8571add3722e6c567e3d81.tar.gz tor-4f3dbb3c0a5c1a6d7d8571add3722e6c567e3d81.zip | |
use !cbt_disabled in place of LearnCBT to avoid needless circs
This would make us do testing circuits "even when cbt is disabled by
consensus, or when we're a directory authority, or when we've failed
to write cbt history to our state file lately." (Roger's words.)
This is a fix for 9671 and an improvement in our fix for 5049.
The original misbehavior was in 0.2.2.14-alpha; the incomplete
fix was in 0.2.3.17-beta.
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 f8521c5cff..1c692ab87b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -147,7 +147,7 @@ static void pathbias_count_success(origin_circuit_t *circ); * 3. If we are a directory authority * 4. If we fail to write circuit build time history to our state file. */ -static int +int circuit_build_times_disabled(void) { if (unit_tests) { |