October 2019 - tor-commits - lists.torproject.org

[tor/master] respect accountingmax during soft hibernation
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit a7ccd9a997bc85c0e03926b7d24f7e05a4a51d39 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Oct 21 04:14:42 2019 -0400 respect accountingmax during soft hibernation Relays now respect their AccountingMax bandwidth again. When relays entered "soft" hibernation (which typically starts when we've hit 90% of our AccountingMax), we had stopped checking whether we should enter hard hibernation. Soft hibernation refuses new connections and new circuits, but the existing circuits can continue, meaning that relays could have exceeded their configured AccountingMax. This commit rolls back some of the cpu-saving fixes, where we tried to avoid calling so many of our events while we're off the network. That's because PERIODIC_EVENT_FLAG_NEED_NET checks net_is_disabled(), which returns true even if we're only in soft hibernation. Fixes bug 32108; bugfix on 0.4.0.1-alpha. --- changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug32108 b/changes/bug32108 new file mode 100644 index 000000000..2806fa3e5 --- /dev/null +++ b/changes/bug32108 @@ -0,0 +1,8 @@ + o Major bugfixes (relay): + - Relays now respect their AccountingMax bandwidth again. When relays + entered "soft" hibernation (which typically starts when we've hit + 90% of our AccountingMax), we had stopped checking whether we should + enter hard hibernation. Soft hibernation refuses new connections and + new circuits, but the existing circuits can continue, meaning that + relays could have exceeded their configured AccountingMax. Fixes + bug 32108; bugfix on 0.4.0.1-alpha. diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 18e87fa87..193df61d0 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1397,7 +1397,7 @@ STATIC periodic_event_item_t periodic_events[] = { /* This is a legacy catch-all callback that runs once per second if * we are online and active. */ CALLBACK(second_elapsed, NET_PARTICIPANT, - FL(NEED_NET)|FL(RUN_ON_DISABLE)), + FL(RUN_ON_DISABLE)), /* XXXX Do we have a reason to do this on a callback? Does it do any good at * all? For now, if we're dormant, we can let our listeners decay. */

1 0

[tor/maint-0.4.2] respect accountingmax during soft hibernation
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit a7ccd9a997bc85c0e03926b7d24f7e05a4a51d39 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Oct 21 04:14:42 2019 -0400 respect accountingmax during soft hibernation Relays now respect their AccountingMax bandwidth again. When relays entered "soft" hibernation (which typically starts when we've hit 90% of our AccountingMax), we had stopped checking whether we should enter hard hibernation. Soft hibernation refuses new connections and new circuits, but the existing circuits can continue, meaning that relays could have exceeded their configured AccountingMax. This commit rolls back some of the cpu-saving fixes, where we tried to avoid calling so many of our events while we're off the network. That's because PERIODIC_EVENT_FLAG_NEED_NET checks net_is_disabled(), which returns true even if we're only in soft hibernation. Fixes bug 32108; bugfix on 0.4.0.1-alpha. --- changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug32108 b/changes/bug32108 new file mode 100644 index 000000000..2806fa3e5 --- /dev/null +++ b/changes/bug32108 @@ -0,0 +1,8 @@ + o Major bugfixes (relay): + - Relays now respect their AccountingMax bandwidth again. When relays + entered "soft" hibernation (which typically starts when we've hit + 90% of our AccountingMax), we had stopped checking whether we should + enter hard hibernation. Soft hibernation refuses new connections and + new circuits, but the existing circuits can continue, meaning that + relays could have exceeded their configured AccountingMax. Fixes + bug 32108; bugfix on 0.4.0.1-alpha. diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 18e87fa87..193df61d0 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1397,7 +1397,7 @@ STATIC periodic_event_item_t periodic_events[] = { /* This is a legacy catch-all callback that runs once per second if * we are online and active. */ CALLBACK(second_elapsed, NET_PARTICIPANT, - FL(NEED_NET)|FL(RUN_ON_DISABLE)), + FL(RUN_ON_DISABLE)), /* XXXX Do we have a reason to do this on a callback? Does it do any good at * all? For now, if we're dormant, we can let our listeners decay. */

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c Merge: edc3f7063 a7ccd9a99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:46:10 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2 changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 1cdc030c3d3afbe16461271a1147397f87ba5693 Merge: 91413e04b 2ed194c9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:47:28 2019 -0400 Merge branch 'maint-0.4.2' changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c Merge: edc3f7063 a7ccd9a99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:46:10 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2 changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 443df7e0d25710036c4cc821954cfd92386419a3 Merge: 869e15cbf 2ed194c9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:47:28 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] respect accountingmax during soft hibernation
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit a7ccd9a997bc85c0e03926b7d24f7e05a4a51d39 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Oct 21 04:14:42 2019 -0400 respect accountingmax during soft hibernation Relays now respect their AccountingMax bandwidth again. When relays entered "soft" hibernation (which typically starts when we've hit 90% of our AccountingMax), we had stopped checking whether we should enter hard hibernation. Soft hibernation refuses new connections and new circuits, but the existing circuits can continue, meaning that relays could have exceeded their configured AccountingMax. This commit rolls back some of the cpu-saving fixes, where we tried to avoid calling so many of our events while we're off the network. That's because PERIODIC_EVENT_FLAG_NEED_NET checks net_is_disabled(), which returns true even if we're only in soft hibernation. Fixes bug 32108; bugfix on 0.4.0.1-alpha. --- changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug32108 b/changes/bug32108 new file mode 100644 index 000000000..2806fa3e5 --- /dev/null +++ b/changes/bug32108 @@ -0,0 +1,8 @@ + o Major bugfixes (relay): + - Relays now respect their AccountingMax bandwidth again. When relays + entered "soft" hibernation (which typically starts when we've hit + 90% of our AccountingMax), we had stopped checking whether we should + enter hard hibernation. Soft hibernation refuses new connections and + new circuits, but the existing circuits can continue, meaning that + relays could have exceeded their configured AccountingMax. Fixes + bug 32108; bugfix on 0.4.0.1-alpha. diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 18e87fa87..193df61d0 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1397,7 +1397,7 @@ STATIC periodic_event_item_t periodic_events[] = { /* This is a legacy catch-all callback that runs once per second if * we are online and active. */ CALLBACK(second_elapsed, NET_PARTICIPANT, - FL(NEED_NET)|FL(RUN_ON_DISABLE)), + FL(RUN_ON_DISABLE)), /* XXXX Do we have a reason to do this on a callback? Does it do any good at * all? For now, if we're dormant, we can let our listeners decay. */

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c Merge: edc3f7063 a7ccd9a99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:46:10 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2 changes/bug32108 | 8 ++++++++ src/core/mainloop/mainloop.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 22 Oct '19

22 Oct '19

commit 3caad9ff22ad55fcd1f3de2f48e4aa003ce54aef Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 22 17:52:55 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+fr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index e7c876289..0bab13384 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -59,14 +59,15 @@ msgstr "" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" +"Le pistage, la surveillance et la censure sont très répandus sur Internet." #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Take back the internet with Tor. Donate now." -msgstr "" +msgstr "Avec Tor, réappropriez-vous Internet. Faites un don maintenant." #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Give today, and Mozilla will match your donation." -msgstr "" +msgstr "Faites un don aujourd’hui et Mozilla fera un don équivalent." #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.title)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 22 Oct '19

22 Oct '19

commit c6091fc371f79860c04bcc540a0eced7a2c5d95b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 22 17:52:46 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index 55a88238a..0bab13384 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -63,7 +63,7 @@ msgstr "" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Take back the internet with Tor. Donate now." -msgstr "" +msgstr "Avec Tor, réappropriez-vous Internet. Faites un don maintenant." #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Give today, and Mozilla will match your donation."

1 0