- tor-commits - lists.torproject.org

[torspec/main] prop328: Fix the usage of extra-info versus server descriptor
by dgoulet＠torproject.org 01 Nov '21

01 Nov '21

commit 514cb9d45a0fbd6d0d9a198567eb18e1cf8f02e4 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 1 16:07:54 2021 -0400 prop328: Fix the usage of extra-info versus server descriptor Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/328-relay-overload-report.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/proposals/328-relay-overload-report.md b/proposals/328-relay-overload-report.md index ea0aa95..e9634ae 100644 --- a/proposals/328-relay-overload-report.md +++ b/proposals/328-relay-overload-report.md @@ -25,8 +25,11 @@ possibly misbehaving or under DDoS attack. We propose that relays start collecting several metrics (see section 2) reflecting their loads from different component of tor. -Then, we propose that 3 new lines be added to the server descriptor document -(see dir-spec.txt, section 2.1.1) if only the overload case arises. +Then, we propose that 1 new line be added to the server descriptor document +(see dir-spec.txt, section 2.1.1) for the general overload case. + +And 2 new lines to the extra-info document (see dir-spec.txt, section 2.1.2) +for more specific overload cases. The following describes a series of metrics to collect but more might come in the future and thus this is not an exhaustive list. @@ -79,6 +82,9 @@ descriptor, as well as the number of times these limits were reached, for read and write, in the past 24 hours starting at the provided timestamp rounded down to the hour. +The format of this overload line added in the extra-info document is as +follows: + ``` "overload-ratelimits" SP version SP YYYY-MM-DD SP HH:MM:SS SP rate-limit SP burst-limit @@ -104,7 +110,8 @@ Not having enough file descriptors in this day of age is really a misconfiguration or a too old operation system. That way, we can very quickly notice which relay has a value too small and we can notify them. -This should be published in this format: +The format of this overload line added in the extra-info document is as +follows: ``` "overload-fd-exhausted" SP version YYYY-MM-DD HH:MM:SS NL

1 0

[torspec/main] dir-spec: Mishap, the overload lines are already in the spec
by dgoulet＠torproject.org 01 Nov '21

01 Nov '21

commit 9ef4716930d33f0ac3cc20d12ce352c6c5f69a54 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 1 16:09:03 2021 -0400 dir-spec: Mishap, the overload lines are already in the spec Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- dir-spec.txt | 69 ------------------------------------------------------------ 1 file changed, 69 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 5076366..543e341 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -955,75 +955,6 @@ Table of Contents [Before Tor 0.4.5.1-alpha, this field was optional.] - "overload-general" SP version SP YYYY-MM-DD HH:MM:SS NL - - [At most once.] - - Indicate that the relay is overloaded due to one or many conditions - listed in proposal 328 section 1.1. - - The timestamp is always rounded to the hour indicating when was the last - time the relay detected an overloaded state. - - The 'version' field is a versioning field and is set to '1'. See prop328 - for what consists of an overload state. - - This field remains in place for 72 hours since last triggered. If the - limits are reached again in this period, the timestamp is updated, and - this 72 hour period restarts. - - This indicator is not persistent on disk meaning that if the relay - restarts, the overload state is reset and disappear from the descriptor. - - [Introduced in version 0.4.6.1-alpha] - - "overload-ratelimits" SP version SP YYYY-MM-DD SP HH:MM:SS - SP rate-limit SP burst-limit - SP read-overload-count SP write-overload-count NL - - [At most once.] - - Indiate that the relay read or write rate limits were reached which is - a specific overload signal. - - The 'version' field is a versioning field and is set to '1'. - - The '{rate|burst}-limit' are respectively the torrc options - 'BandwidthBurst' and 'BandwidthRate' limits set by the relay. In other - words, they are the bandwidth limitations of the relay. - - The "{read|write}-overload-count" are the counts of how many times the - reported limits of burst/rate were exhausted and thus the maximum - between the read and write count occurrences. To make the counter more - meaningful and to avoid multiple connections saturating the counter when - a relay is overloaded, we only increment it once a minute. - - They span from the past 24 hours starting at the provided timestamp - rounded down to the hour. - - These counters are not persistent on disk meaning that if the relay - restarts, the overload state is reset and disappear from the descriptor. - - [Introduced in version 0.4.6.1-alpha] - - "overload-fd-exhausted" SP version YYYY-MM-DD HH:MM:SS NL - - [At most once.] - - As the overloaded line, the timestamp indicates that the maximum of file - descriptors was reached between this timestamp and the "published" - timestamp of the document. - - This overload field remains in place for 72 hours since last triggered. - If the limits are reached again in this period, the timestamp is - updated, and this 72 hour period restarts. - - The 'version' field is a versioning field and is set to '1'. - - This indicator is not persistent on disk meaning that if the relay - restarts, the overload state is reset and disappear from the descriptor. - - [Introduced in version 0.4.6.1-alpha] 2.1.2. Extra-info document format

1 0

[manual/master] trigger build of https://tpo.pages.torproject.net/community/l10n/ when changes in content
by emmapeel＠torproject.org 01 Nov '21

01 Nov '21

commit 5c7d18bc5a5e5cda25d3f4dc1da47c80e6bd0494 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Nov 1 18:51:04 2021 +0100 trigger build of https://tpo.pages.torproject.net/community/l10n/ when changes in content --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea4f9e7..ef3b012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,3 +113,12 @@ check_l10n: - git clone https://gitlab.torproject.org/tpo/community/l10n.git - echo 'lets see if there are any BROKEN LINKS on the translations' - l10n/bin/check_markdown_links.py i18n/ + +translation_tests_page: + stage: test_l10n + allow_failure: true + trigger: tpo/community/l10n + rules: + - changes: + - content/**/*.lr + - i18n/contents.pot

1 0

[manual/master] smaller pulls
by emmapeel＠torproject.org 01 Nov '21

01 Nov '21

commit 5b293a10d6230f9ddc9d2e8158831fddfeb15578 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Nov 1 21:03:35 2021 +0100 smaller pulls --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef3b012..272e6da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,14 +83,13 @@ check_new_strings: script: - *apt-template - DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev python3-setuptools i18nspector python3-polib python3-requests ca-certificates apt-utils -y - - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - git clone --depth=1 https://gitlab.torproject.org/tpo/community/l10n.git - echo 'lets see if there are any UPDATES ON THE STRINGS for translation after this changes' - l10n/bin/check_po_status.py $TRANSLATION_BRANCH artifacts: paths: - public - i18n - - l10n check_l10n: allow_failure: true @@ -108,9 +107,10 @@ check_l10n: only: - translations script: + - *apt-template - DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector python3-polib ca-certificates -y - rm -rf l10n - - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - git clone --depth=1 https://gitlab.torproject.org/tpo/community/l10n.git - echo 'lets see if there are any BROKEN LINKS on the translations' - l10n/bin/check_markdown_links.py i18n/

1 0

[styleguide/master] Add "deploy" stage to make the static shim job work
by kez＠torproject.org 01 Nov '21

01 Nov '21

commit 0dd18eb19384844bd373cab764f9c1033acb8cbd Author: kez <kez(a)torproject.org> Date: Mon Nov 1 12:58:16 2021 -0700 Add "deploy" stage to make the static shim job work --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b4be34..4996f81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ variables: stages: - build + - deploy - pages build:

1 0

[styleguide/master] Add CI file
by kez＠torproject.org 01 Nov '21

01 Nov '21

commit 57e1bfcabcea4ef467d5322b13741e69304efc20 Author: kez <kez(a)torproject.org> Date: Mon Nov 1 12:26:05 2021 -0700 Add CI file --- .gitlab-ci.yml | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..6b4be34 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,83 @@ +image: python:bullseye + +include: + project: tpo/tpa/ci-templates + file: static-shim-deploy.yml + +# This template should be usable on any system that's based on apt. +# taken from tor gitlabci + +.apt-template: &apt-template | + export LC_ALL=C.UTF-8 + echo Etc/UTC > /etc/timezone + mkdir -p apt-cache + export APT_CACHE_DIR="$(pwd)/apt-cache" + echo 'quiet "1";' \ + 'APT::Install-Recommends "0";' \ + 'APT::Install-Suggests "0";' \ + 'APT::Acquire::Retries "20";' \ + 'APT::Get::Assume-Yes "true";' \ + 'Dpkg::Use-Pty "0";' \ + "Dir::Cache::Archives \"${APT_CACHE_DIR}\"; " \ + >> /etc/apt/apt.conf.d/99gitlab + apt-get update -qq + apt-get upgrade -qy + +variables: + GIT_SUBMODULE_STRATEGY: recursive + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + SITE_URL: styleguide.torproject.org + SUBDIR: public/ + +stages: + - build + - pages + +build: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - .cache/pip + - .cache/lektor/builds/ + stage: build + script: + - *apt-template + - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel i18nspector apt-utils ca-certificates -y + - pip3 install virtualenv + - virtualenv venv + - source venv/bin/activate + - pip3 install lektor + - echo 'reinstall lektor plugins' + - lektor plugins reinstall + - echo 'building lektor 3 more times to get translations in place' + - for i in {1..3}; do lektor build --output-path public; done + artifacts: + paths: + - public + rules: + - when: always + +pages: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - .cache/pip + - .cache/lektor/builds/ + stage: pages + dependencies: + - build + script: + - rm -r public/.lektor + artifacts: + paths: + - public + rules: + - when: always

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 01 Nov '21

01 Nov '21

commit 9dee2cddfd8eef3812d981f5efd3422567a05870 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 1 19:47:50 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ka.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index b052774f55..c7da1b8be2 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -2536,11 +2536,11 @@ msgstr "ვრცლად." #: templates/macros/pagination.html:5 templates/macros/pagination.html:45 msgid "Newer" -msgstr "" +msgstr "ახლანდელი" #: templates/macros/pagination.html:59 templates/macros/pagination.html:61 msgid "Older" -msgstr "" +msgstr "წინანდელი" #: templates/macros/question.html:15 msgid "Suggest Feedback"

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 01 Nov '21

01 Nov '21

commit d0b51fabc237bb13511248138f568c62a3b75146 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 1 19:47:22 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ka/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd index a0fed7d7e9..d0be6d2c46 100644 --- a/ka/torbutton.dtd +++ b/ka/torbutton.dtd @@ -45,7 +45,7 @@ <!ENTITY torbutton.prefs.sec_custom_summary "თქვენ მიერ მითითებული პარამეტრები ბრაუზერში, არაა მისაღები უსაფრთხოებისთვის. პირადი მონაცემების სათანადოდ დაცვის უზრუნველსაყოფად, გირჩევთ შეარჩიოთ უსაფრთხოების ნაგულისხმევი დონეებიდან რომელიმე."> <!ENTITY torbutton.prefs.sec_restore_defaults "ნაგულისხმევის აღდგენა"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "უსაფრთხოების დამატებითი პარამ."> -<!ENTITY torbutton.prefs.sec_change "Change…"> +<!ENTITY torbutton.prefs.sec_change "შეცვლა..."> <!ENTITY torbutton.circuit_display.title "Tor-წრედი"> <!ENTITY torbutton.circuit_display.new_circuit "ახალი წრედი ამ საიტისთვის">

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 01 Nov '21

01 Nov '21

commit f60c79f0aef8e9d5b18b460f8e0025d79858528c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 1 19:46:58 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ka.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index fc5eb871a5..dad0a6e51b 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1,8 +1,8 @@ # # Translators: # erinm, 2021 -# Georgianization, 2021 # Emma Peel, 2021 +# Georgianization, 2021 # msgid "" msgstr "" @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-30 09:08+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: Georgianization, 2021\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4157,6 +4157,7 @@ msgstr "პირადულობა ადამიანის ძირი #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" +"თქვენი შემოწირულობა გაორმაგდება Tor-ის მეგობრების მიერ, $150,000-ამდე." #: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000." @@ -4167,7 +4168,7 @@ msgstr "" #: lego/templates/banner.html:31 lego/templates/banner.html:33 #: templates/banner.html:31 templates/banner.html:33 msgid "Donate now" -msgstr "" +msgstr "გაიღეთ თანხა" #: lego/templates/footer.html:13 lego/templates/footer.html:22 #: lego/templates/navbar.html:96 templates/footer.html:13

1 0

[translation/gettor-website-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
by translation＠torproject.org 01 Nov '21

01 Nov '21

commit 21278b2b1df4683f92994b941bc8542d7d664484 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 1 19:45:30 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-cont… --- contents+ka.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index a6e4863caf..07bb8a470c 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -221,6 +221,7 @@ msgstr "პირადულობა ადამიანის ძირი #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" +"თქვენი შემოწირულობა გაორმაგდება Tor-ის მეგობრების მიერ, $150,000-ამდე." #: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000." @@ -230,7 +231,7 @@ msgstr "" #: lego/templates/banner.html:32 templates/banner.html:32 msgid "Donate now" -msgstr "" +msgstr "გაიღეთ თანხა" #: lego/templates/banner.html:34 templates/banner.html:34 msgid "DONATE NOW"

1 0