Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3

This commit is contained in:
Nick Mathewson 2018-03-13 11:02:34 -04:00
commit f0f2fab5e1
2 changed files with 13 additions and 9 deletions

3
changes/ticket23635 Normal file
View File

@ -0,0 +1,3 @@
o Documentation:
- Improved the documentation of AccountingStart paremeter.
Closes ticket 23635.

View File

@ -2163,15 +2163,16 @@ is non-zero):
(Default: max) (Default: max)
[[AccountingStart]] **AccountingStart** **day**|**week**|**month** [__day__] __HH:MM__:: [[AccountingStart]] **AccountingStart** **day**|**week**|**month** [__day__] __HH:MM__::
Specify how long accounting periods last. If **month** is given, each Specify how long accounting periods last. If **month** is given,
accounting period runs from the time __HH:MM__ on the __dayth__ day of one 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 month to the same day and time of the next. The relay will go at full speed,
28.) If **week** is given, each accounting period runs from the time __HH:MM__ use all the quota you specify, then hibernate for the rest of the period. (The
of the __dayth__ day of one week to the same day and time of the next week, day must be between 1 and 28.) If **week** is given, each accounting period
with Monday as day 1 and Sunday as day 7. If **day** is given, each runs from the time __HH:MM__ of the __dayth__ day of one week to the same day
accounting period runs from the time __HH:MM__ each day to the same time on and time of the next week, with Monday as day 1 and Sunday as day 7. If **day**
the next day. All times are local, and given in 24-hour time. (Default: is given, each accounting period runs from the time __HH:MM__ each day to the
"month 1 0:00") 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**:: [[RefuseUnknownExits]] **RefuseUnknownExits** **0**|**1**|**auto**::
Prevent nodes that don't appear in the consensus from exiting using this Prevent nodes that don't appear in the consensus from exiting using this