nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Browse Source 
Conflicts:
	src/or/circuitbuild.c
This commit is contained in:
Nick Mathewson 2013-09-04 16:08:02 -04:00
commit a60d21a85d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug9671_023 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes:
- If the circuit build timeout logic is disabled (via the consensus,
or because we are an authority), then don't build testing circuits.
Fixes bug 9657; bugfix on 0.2.2.14-alpha.

4
src/or/circuituse.c
View File

@ -948,7 +948,7 @@ circuit_predict_and_launch_new(void)
* want, don't do another -- we want to leave a few slots open so * want, don't do another -- we want to leave a few slots open so
* we can still build circuits preemptively as needed. */ * we can still build circuits preemptively as needed. */
if (num < MAX_UNUSED_OPEN_CIRCUITS-2 && if (num < MAX_UNUSED_OPEN_CIRCUITS-2 &&
get_options()->LearnCircuitBuildTimeout && ! circuit_build_times_disabled() &&
circuit_build_times_needs_circuits_now(&circ_times)) { circuit_build_times_needs_circuits_now(&circ_times)) {
flags = CIRCLAUNCH_NEED_CAPACITY; flags = CIRCLAUNCH_NEED_CAPACITY;
log_info(LD_CIRC, log_info(LD_CIRC,
@ -1084,7 +1084,7 @@ circuit_expire_old_circuits_clientside(void)
tor_gettimeofday(&now); tor_gettimeofday(&now);
cutoff = now; cutoff = now;
if (get_options()->LearnCircuitBuildTimeout && if (! circuit_build_times_disabled() &&
circuit_build_times_needs_circuits(&circ_times)) { circuit_build_times_needs_circuits(&circ_times)) {
/* Circuits should be shorter lived if we need more of them /* Circuits should be shorter lived if we need more of them
* for learning a good build timeout */ * for learning a good build timeout */