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

man: Update the CircuitPriorityHalflife entry

Browse Source 
The behavior has changed slightly in the previous commits.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-02-15 14:53:10 -05:00
parent e19cd38f08
commit 779eded6bb
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/tor.1.txt
View File

@ -777,17 +777,15 @@ GENERAL OPTIONS
This is useful when running on flash memory or other media that support This is useful when running on flash memory or other media that support
only a limited number of writes. (Default: 0) only a limited number of writes. (Default: 0)
[[CircuitPriorityHalflife]] **CircuitPriorityHalflife** __NUM1__:: [[CircuitPriorityHalflife]] **CircuitPriorityHalflife** __NUM__::
If this value is set, we override the default algorithm for choosing which If this value is set, we override the default algorithm for choosing which
circuit's cell to deliver or relay next. When the value is 0, we circuit's cell to deliver or relay next. It is delivered first to the
round-robin between the active circuits on a connection, delivering one circuit that has the lowest weighted cell count, where cells are weighted
cell from each in turn. When the value is positive, we prefer delivering exponentially according to this value (in seconds). If the value is -1, it
cells from whichever connection has the lowest weighted cell count, where is taken from the consensus if possible else it will fallback to the
cells are weighted exponentially according to the supplied default value of 30. Minimum: 1, Maximum: 2147483647. This can be defined
CircuitPriorityHalflife value (in seconds). If this option is not set at as a float value. This is an advanced option; you generally shouldn't have
all, we use the behavior recommended in the current consensus to mess with it. (Default: -1)
networkstatus. This is an advanced option; you generally shouldn't have
to mess with it. (Default: not set)
[[CountPrivateBandwidth]] **CountPrivateBandwidth** **0**|**1**:: [[CountPrivateBandwidth]] **CountPrivateBandwidth** **0**|**1**::
If this option is set, then Tor's rate-limiting applies not only to If this option is set, then Tor's rate-limiting applies not only to

2
src/or/config.c
View File

@ -263,7 +263,7 @@ static config_var_t option_vars_[] = {
OBSOLETE("CircuitIdleTimeout"), OBSOLETE("CircuitIdleTimeout"),
V(CircuitsAvailableTimeout, INTERVAL, "0"), V(CircuitsAvailableTimeout, INTERVAL, "0"),
V(CircuitStreamTimeout, INTERVAL, "0"), V(CircuitStreamTimeout, INTERVAL, "0"),
V(CircuitPriorityHalflife, DOUBLE, "-100.0"), /*negative:'Use default'*/ V(CircuitPriorityHalflife, DOUBLE, "-1.0"), /*negative:'Use default'*/
V(ClientDNSRejectInternalAddresses, BOOL,"1"), V(ClientDNSRejectInternalAddresses, BOOL,"1"),
V(ClientOnly, BOOL, "0"), V(ClientOnly, BOOL, "0"),
V(ClientPreferIPv6ORPort, AUTOBOOL, "auto"), V(ClientPreferIPv6ORPort, AUTOBOOL, "auto"),