Nick Mathewson
6cb467b462
Merge remote-tracking branch 'github/ticket23354'
2018-04-30 09:45:28 -04:00
Nick Mathewson
346c2eb4e6
Merge branch 'bug25843_v2_squashed'
2018-04-27 12:45:07 -04:00
George Kadianakis
d00ed406e0
Introduce torrc option NumPrimaryGuards
2018-04-27 12:44:54 -04:00
Nick Mathewson
3527f4b8a4
Merge remote-tracking branch 'github/lazy_bucket_refill'
2018-04-23 09:47:05 -04:00
Nick Mathewson
8c01aee2e3
Document default for ControlSocket.
...
Closes 25897.
2018-04-23 07:47:50 -04:00
Nick Mathewson
3b2ed849c8
Clean up the documentation for *DownloadInitialDelay
2018-04-22 15:55:09 -04:00
Nick Mathewson
d8ac7d557c
Merge branch 'maint-0.3.3'
2018-04-20 14:40:09 -04:00
Nick Mathewson
cb813a352c
Fix documentation bug 25857: the universe is ::/0, not ::/128
...
Patch from CTassisF.
2018-04-20 14:35:33 -04:00
Nick Mathewson
47df912f1c
Remove the periodic refill event entirely.
...
Now that we update our buckets on demand before reading or writing,
we no longer need to update them all every TokenBucketRefillInterval
msec.
When a connection runs out of bandwidth, we do need a way to
reenable it, however. We do this by scheduling a timer to reenable
all blocked connections for TokenBucketRefillInterval msec after a
connection becomes blocked.
(If we were using PerConnBWRate more, it might make sense to have a
per-connection timer, rather than a single timeout. But since
PerConnBWRate is currently (mostly) unused, I'm going to go for the
simpler approach here, since usually whenever one connection has
become blocked on bandwidth, most connections are blocked on
bandwidth.)
Implements ticket 25373.
2018-04-17 18:20:03 -04:00
Nick Mathewson
f2c81a8eac
Merge branch 'maint-0.3.3'
2018-04-13 13:09:15 -04:00
Mike Perry
21b347e291
doc: Fix typo and clarify that DoS options are relay only
2018-04-13 12:22:02 -04:00
David Goulet
712a7d76a0
doc: Move DOS options below SERVER options
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-13 12:20:59 -04:00
David Goulet
119b053a8a
doc: Improve DoS section of the man page tor.1
...
Add to the Denial of Service section of the man page an explanation about the
three different mitigation Tor has.
Fixes #25248 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-13 12:20:59 -04:00
Nick Mathewson
b152d62cee
Merge branch 'token_bucket_refactor_squashed'
2018-04-13 10:47:24 -04:00
Nick Mathewson
a51630cc9a
Merge branch 'maint-0.3.3'
2018-04-11 15:38:00 -04:00
Nick Mathewson
0803d79f55
Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3
2018-04-11 15:37:56 -04:00
Nick Mathewson
8b8630a501
Rename HSLayer{2,3}Nodes to start without an underscore.
...
The old single-underscore names remain as a deprecated synonym.
Fixes bug 25581; bugfix on 0.3.3.1-alpha.
2018-04-11 15:37:49 -04:00
Nick Mathewson
6e467a7a34
Merge remote-tracking branch 'isis-github/bug25409'
2018-04-10 15:27:09 -04:00
Nick Mathewson
16f08de0fd
Remove TestingEnableTbEmptyEvent
...
This option was used for shadow testing previously, but is no longer
used for anything. It interferes with refactoring our token buckets.
2018-04-10 12:16:21 -04:00
Nick Mathewson
12fc4206f2
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 12:09:00 -04:00
Nick Mathewson
2933f73b31
Merge branch 'maint-0.3.3'
2018-04-05 12:09:00 -04:00
Nick Mathewson
c2d93e8a7d
PerConnBW{Rate,Burst} docs: do not say consensus param is always set
...
Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
2018-04-05 12:08:35 -04:00
David Goulet
6bd8f648b7
man: Move RephistTrackTime to the server section
...
Every node in the network uses that value, it is a general server options, not
a dirauth specific one.
Fixes #25720
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-05 09:42:45 -04:00
Nick Mathewson
43f3155582
Merge branch 'maint-0.3.3'
2018-04-05 08:21:43 -04:00
David Goulet
ff38c0589c
man: Add a comment to anchor only option
...
Some anchor don't appear in the final man page so document those so we
understand why we do that in the future.
Part of #25582
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-04 11:38:42 -04:00
Neel Chauhan
9df110cd72
Remove PortForwarding options
...
Signed-off-by: Isis Lovecruft <isis@torproject.org>
2018-04-04 00:19:33 +00:00
Nick Mathewson
6d7c4c6ec2
Remove erroneous section heading "ExitPolicyDefault"
...
The anchor here was originally introduced to make sure that the
manpage would format correctly, but we had mistaken it for a section
anchor, and introduced a bogus section heading in 3563a2c819
.
Fixes bug 25582; bugfix on 0.3.3.1-alpha.
2018-03-29 15:06:07 -04:00
Nick Mathewson
e8c1d4c8b0
Merge branch 'maint-0.3.3'
2018-03-29 15:00:46 -04:00
teor
6aaafb0672
Document torrc options that only work on v2 onion services
...
RendPostPeriod only works on v2 onion services.
HiddenServiceAuthorizeClient is not yet implemented for v3 onion services.
Closes ticket #25661 , bugfix on 0.3.2.1-alpha.
2018-03-29 15:00:41 -04:00
Nick Mathewson
a324cd9020
Merge branch 'ticket25268_034_01'
2018-03-19 06:01:02 -04:00
ArunaMaurya221B
42008ee721
DisableNetwork documentation improvised
2018-03-13 21:31:10 +01:00
ArunaMaurya221B
a9203c65f1
Revised patch with 78 characters per line
2018-03-13 21:28:37 +01:00
ArunaMaurya221B
c29e66a883
PaddingStatistics documented properly
2018-03-13 21:28:36 +01:00
Nick Mathewson
03f748d0ca
Merge branch 'maint-0.3.3'
2018-03-13 11:03:08 -04:00
Nick Mathewson
f0f2fab5e1
Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
2018-03-13 11:02:34 -04:00
Fernando Fernandez Mancera
c1cfa0fbc4
Tweaks into AccountingStart documentation.
...
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
2018-03-08 12:28:34 +01:00
Nick Mathewson
338dbdab93
Merge branch 'maint-0.3.3'
2018-03-03 11:59:27 -05:00
Alexander Færøy
59a7b00384
Update tor.1.txt with the currently available log domains.
...
See: https://bugs.torproject.org/25378
2018-03-03 11:58:14 -05:00
Nick Mathewson
62482ea279
Merge branch 'maint-0.3.3'
2018-03-03 11:53:05 -05:00
Nick Mathewson
cc7de9ce1d
Merge branch 'ticket23814' into maint-0.3.3
2018-03-03 11:53:01 -05:00
Roger Dingledine
2bd23cebf3
resolve a weird binary character that crept into the man page
2018-03-02 19:21:45 -05:00
Roger Dingledine
b46bda9d18
get rid of extraneous punctuation in man page
2018-03-02 19:07:04 -05:00
Roger Dingledine
6db6a00671
fix a confusing "0 0" in the man page
...
feel free to backport this commit back to 0.3.2.x if you like it
2018-03-02 18:58:29 -05:00
Nick Mathewson
bd71e0a0c8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-16 09:54:13 -05:00
Nick Mathewson
2bcd264a28
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-16 09:48:11 -05:00
Nick Mathewson
d662d4470a
Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3
2018-02-15 21:05:08 -05:00
David Goulet
779eded6bb
man: Update the CircuitPriorityHalflife entry
...
The behavior has changed slightly in the previous commits.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-15 14:54:48 -05:00
Nick Mathewson
86f461e362
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
2018-02-13 15:00:43 -05:00
David Goulet
9cf8d669fa
man: Document default values if not in the consensus for DoS mitigation
...
Fixes #25236
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 14:21:47 -05:00
Fernando Fernandez Mancera
eb089ecaa0
Improve the documentation of AccountingStart parameter.
...
Fixes #23635 .
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
2018-02-12 17:10:04 +01:00