aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-03-13 11:03:08 -0400
committerNick Mathewson <nickm@torproject.org>2018-03-13 11:03:08 -0400
commit03f748d0ca00fa27279b3060eb19b5db23e18f6b (patch)
tree8e74814c38ccc1636fe78e920bb315fde384a93c /doc
parentc6d364e8ae9a0265dd3e80756d7e8e9901cf3dd6 (diff)
parentf0f2fab5e16cadf37938b48a47c062e539eef9c0 (diff)
downloadtor-03f748d0ca00fa27279b3060eb19b5db23e18f6b.tar.gz
tor-03f748d0ca00fa27279b3060eb19b5db23e18f6b.zip
Merge branch 'maint-0.3.3'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt19
1 files changed, 10 insertions, 9 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b8ab7f0997..24b0757858 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2163,15 +2163,16 @@ is non-zero):
(Default: max)
[[AccountingStart]] **AccountingStart** **day**|**week**|**month** [__day__] __HH:MM__::
- Specify how long accounting periods last. If **month** is given, each
- accounting period runs from the time __HH:MM__ on the __dayth__ day of one
- month to the same day and time of the next. (The day must be between 1 and
- 28.) If **week** is given, each accounting period runs from the time __HH:MM__
- of the __dayth__ day of one week to the same day and time of the next week,
- with Monday as day 1 and Sunday as day 7. If **day** is given, each
- accounting period runs from the time __HH:MM__ each day to the same time on
- the next day. All times are local, and given in 24-hour time. (Default:
- "month 1 0:00")
+ Specify how long accounting periods last. If **month** is given,
+ each accounting period runs from the time __HH:MM__ on the __dayth__ day of one
+ month to the same day and time of the next. The relay will go at full speed,
+ use all the quota you specify, then hibernate for the rest of the period. (The
+ day must be between 1 and 28.) If **week** is given, each accounting period
+ runs from the time __HH:MM__ of the __dayth__ day of one week to the same day
+ and time of the next week, with Monday as day 1 and Sunday as day 7. If **day**
+ is given, each accounting period runs from the time __HH:MM__ each day to the
+ same time on the next day. All times are local, and given in 24-hour time.
+ (Default: "month 1 0:00")
[[RefuseUnknownExits]] **RefuseUnknownExits** **0**|**1**|**auto**::
Prevent nodes that don't appear in the consensus from exiting using this