March 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit f0f2fab5e16cadf37938b48a47c062e539eef9c0 Merge: 6bc324c96 c1cfa0fbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 11:02:34 2018 -0400 Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3 changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 03f748d0ca00fa27279b3060eb19b5db23e18f6b Merge: c6d364e8a f0f2fab5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 11:03:08 2018 -0400 Merge branch 'maint-0.3.3' changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[tor/master] Tweaks into AccountingStart documentation.
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit c1cfa0fbc4864ae5c54cb89c84a184523ea1aa9e Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Thu Mar 8 12:28:34 2018 +0100 Tweaks into AccountingStart documentation. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 54375300a..41dab4ae3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2173,7 +2173,7 @@ is non-zero): 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 month.(The + 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**

1 0

[tor/release-0.3.3] Improve the documentation of AccountingStart parameter.
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit eb089ecaa023eaacd06f042e67bf4b4adda1c8ee Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Mon Feb 12 17:10:04 2018 +0100 Improve the documentation of AccountingStart parameter. Fixes #23635. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/changes/ticket23635 b/changes/ticket23635 new file mode 100644 index 000000000..54d303e4b --- /dev/null +++ b/changes/ticket23635 @@ -0,0 +1,3 @@ + o Documentation: + - Improved the documentation of AccountingStart paremeter. + Closes ticket 23635. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5ad818365..54375300a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2170,15 +2170,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 month.(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

1 0

[tor/release-0.3.3] Tweaks into AccountingStart documentation.
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit c1cfa0fbc4864ae5c54cb89c84a184523ea1aa9e Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Thu Mar 8 12:28:34 2018 +0100 Tweaks into AccountingStart documentation. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 54375300a..41dab4ae3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2173,7 +2173,7 @@ is non-zero): 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 month.(The + 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**

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit f0f2fab5e16cadf37938b48a47c062e539eef9c0 Merge: 6bc324c96 c1cfa0fbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 11:02:34 2018 -0400 Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3 changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 5ee93047cbf711398ba7425b86d961e688cfaa53 Merge: 504dc5a93 f0f2fab5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 11:03:08 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit d60dc27555a2bed448617e0b82e61817c9cff895 Merge: 094294dbb 0e7f15fdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.9
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24 Merge: 9eb6f9d3c 3418a3a7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:58:02 2018 -0400 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 950606dcc947fee4a7196bce0bab1595164fbab0 Merge: 676a28599 38b7885c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 10:58:03 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)

1 0