- tor-commits - lists.torproject.org

[manual/master] test different stages to customise tests for special branches or changes
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit ebc5ba27f837f94d3c2c4ab43c2ccdd58f65c655 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 12:33:03 2021 +0000 test different stages to customise tests for special branches or changes --- .gitlab-ci.yml | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 061766f..828303f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,15 +1,15 @@ image: debian:buster-slim - -cache: + +cache: key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} paths: - packages - lego - apt-cache - + # 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 @@ -25,11 +25,16 @@ cache: >> /etc/apt/apt.conf.d/99gitlab apt-get update -qq apt-get upgrade -qy - + variables: GIT_SUBMODULE_STRATEGY: recursive - -pages: + +stages: + - build + - test_l10n + +pages: + stage: build script: - *apt-template - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector apt-utils -y @@ -40,16 +45,37 @@ pages: - echo 'checking out translations' - rm -rf i18n - git clone --branch tbmanual-contentspot https://git.torproject.org/translation.git i18n - - echo 'building lektor 3 times to get translations in place' + - echo 'reinstall lektor plugins' - lektor plugins reinstall + - echo 'build lektor' + - lektor build --output-path public + artifacts: + paths: + - public + - i18n + - l10n + +check_new_strings: + stage: test_l10n + needs: [pages] + rules: + - changes: + - content/* + - templates/* + script: + - echo 'building lektor 3 more times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public - echo 'ok, we built it! now we will make some tests' - pip3 install polib - git clone https://gitlab.torproject.org/tpo/community/l10n.git - echo 'lets see if there are any updates in the strings for translation' - l10n/bin/check_po_status.py tbmanual-contentspot + +check_l10n: + stage: test_l10n + needs: [pages] + only: + - translations + script: - echo 'lets see if there are any broken links on the translations' - - l10n/bin/check_markdown_links.py i18n/ - artifacts: - paths: - - public + - l10n/bin/check_markdown_links.py i18n/ \ No newline at end of file

1 0

[manual/master] recover new file
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit a00c4db4203c15b7edd589f800f7657dd55d5a75 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 15:00:38 2021 +0200 recover new file --- content/about/contents.lr | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/content/about/contents.lr b/content/about/contents.lr new file mode 100644 index 0000000..33bf3d4 --- /dev/null +++ b/content/about/contents.lr @@ -0,0 +1,29 @@ +_model: topic +--- +title: ABOUT TOR BROWSER +--- +description: Learn what Tor Browser can do to protect your privacy and anonymity +--- +seo_slug: about +--- +key: 1 +--- +body: + +Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties: + +* Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit. + +* The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself. + +In addition, Tor Browser is designed to prevent websites from “fingerprinting” or identifying you based on your browser configuration. + +By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a [New Identity](/managing-identities/#new-identity) is requested). + +### HOW TOR WORKS + +Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as *relays*) in the Tor network. The last relay in the circuit (the “exit relay”) then sends the traffic out onto the public Internet. + +<img class="" src="../static/images/how-tor-works.png" alt="How Tor Browser works"> + +The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.

1 0

[manual/master] remove spurious whitespaces from CI Lint
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit e143f25064358b01131a92a0380f89b2d10d80dd Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 14:55:22 2021 +0200 remove spurious whitespaces from CI Lint --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbcb6c3..ff256bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,14 +25,14 @@ cache: >> /etc/apt/apt.conf.d/99gitlab apt-get update -qq apt-get upgrade -qy - + variables: GIT_SUBMODULE_STRATEGY: recursive - + stages: - build - test_l10n - + pages: stage: build script: @@ -54,7 +54,7 @@ pages: - public - i18n - l10n - + check_new_strings: stage: test_l10n needs: [pages] @@ -74,7 +74,7 @@ check_new_strings: paths: - public - i18n - + check_l10n: stage: test_l10n needs: [pages] @@ -82,4 +82,4 @@ check_l10n: - translations script: - echo 'lets see if there are any broken links on the translations' - - l10n/bin/check_markdown_links.py i18n/ \ No newline at end of file + - l10n/bin/check_markdown_links.py i18n/

1 0

[manual/master] add artifacts to publish complete translations when there are changes to the content
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit edef60c94a7cab02d2f0b96b1010f7ab4e5f1f92 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 12:49:00 2021 +0000 add artifacts to publish complete translations when there are changes to the content --- .gitlab-ci.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 828303f..cbcb6c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,15 +1,15 @@ image: debian:buster-slim - -cache: + +cache: key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} paths: - packages - lego - apt-cache - + # 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 @@ -25,15 +25,15 @@ cache: >> /etc/apt/apt.conf.d/99gitlab apt-get update -qq apt-get upgrade -qy - + variables: GIT_SUBMODULE_STRATEGY: recursive - + stages: - build - test_l10n - -pages: + +pages: stage: build script: - *apt-template @@ -54,7 +54,7 @@ pages: - public - i18n - l10n - + check_new_strings: stage: test_l10n needs: [pages] @@ -70,7 +70,11 @@ check_new_strings: - git clone https://gitlab.torproject.org/tpo/community/l10n.git - echo 'lets see if there are any updates in the strings for translation' - l10n/bin/check_po_status.py tbmanual-contentspot - + artifacts: + paths: + - public + - i18n + check_l10n: stage: test_l10n needs: [pages]

1 0

[manual/master] better install with debian, and we need polib installed in all jobs
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit 298fe357c4c9e8b0a541a9601674af4a5728b7df Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 16:06:37 2021 +0200 better install with debian, and we need polib installed in all jobs --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b394cb4..dc98b37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ check_new_strings: - templates/**/* script: - *apt-template - - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector apt-utils -y + - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector apt-utils python3-polib -y - pip3 install virtualenv - virtualenv venv - source venv/bin/activate @@ -82,7 +82,6 @@ check_new_strings: - echo 'building lektor 3 more times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public - echo 'ok, we built it! now we will make some tests' - - pip3 install polib - git clone https://gitlab.torproject.org/tpo/community/l10n.git - echo 'lets see if there are any updates in the strings for translation' - l10n/bin/check_po_status.py tbmanual-contentspot @@ -106,5 +105,6 @@ check_l10n: only: - translations script: + - DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector python3-polib -y - echo 'lets see if there are any broken links on the translations' - l10n/bin/check_markdown_links.py i18n/

1 0

[manual/master] cache exists inside the job
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit 6710c7a1c0364241bd1986d0597fd5fd1a381940 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 15:14:39 2021 +0200 cache exists inside the job --- .gitlab-ci.yml | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff256bc..5119cc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,15 +1,9 @@ image: debian:buster-slim - -cache: - key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} - paths: - - packages - - lego - - apt-cache - + + # 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 @@ -34,6 +28,13 @@ stages: - test_l10n pages: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv stage: build script: - *apt-template @@ -56,6 +57,13 @@ pages: - l10n check_new_strings: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv stage: test_l10n needs: [pages] rules: @@ -76,6 +84,14 @@ check_new_strings: - i18n check_l10n: + cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + - venv + - i18n stage: test_l10n needs: [pages] only:

1 0

[manual/master] correct condition. l10n does not go here
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit c674d69eeb2a4ca9ba4d21d905198363604d2177 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 15:40:22 2021 +0200 correct condition. l10n does not go here --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5119cc8..76f172c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,6 @@ pages: paths: - public - i18n - - l10n check_new_strings: cache: @@ -66,10 +65,8 @@ check_new_strings: - venv stage: test_l10n needs: [pages] - rules: - - changes: - - content/* - - templates/* + except: + - merge_requests script: - echo 'building lektor 3 more times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public @@ -82,6 +79,7 @@ check_new_strings: paths: - public - i18n + - l10n check_l10n: cache:

1 0

[manual/master] cannot write /etc/timezone on my runner
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit 57c6a35eb94a3d568fba780d1941c0e38c1f6ac7 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 17:41:42 2021 +0200 cannot write /etc/timezone on my runner --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc98b37..ca7a958 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: debian:buster-slim +image: debian:buster # This template should be usable on any system that's based on apt. @@ -6,7 +6,6 @@ image: debian:buster-slim .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";' \

1 0

[manual/master] we also need to install lektor for this job
by emmapeel＠torproject.org 03 Sep '21

03 Sep '21

commit faf4c88540a481396676125ba761933e9ef39105 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 2 15:59:52 2021 +0200 we also need to install lektor for this job --- .gitlab-ci.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76f172c..b394cb4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,9 +65,20 @@ check_new_strings: - venv stage: test_l10n needs: [pages] - except: - - merge_requests + only: + refs: + - merge_requests + changes: + - content/**/* + - templates/**/* script: + - *apt-template + - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector apt-utils -y + - pip3 install virtualenv + - virtualenv venv + - source venv/bin/activate + - pip3 install lektor + - lektor plugins reinstall - echo 'building lektor 3 more times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public - echo 'ok, we built it! now we will make some tests'

1 0

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

03 Sep '21

commit 39e1f97c00079758af5e5b200947e9df61f40680 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 3 03:16:47 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+my.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+my.po b/contents+my.po index e57add6919..b9cad1c268 100644 --- a/contents+my.po +++ b/contents+my.po @@ -792,13 +792,13 @@ msgid "" "blocks. These tools are called “pluggable transports”." msgstr "" "Tor ဘရောက်ဇာတွင် ဤပိတ်ဆို့မှုများကို ရှောင်ရှားရန် ဆင်ဆာကျော်ဖြတ်ခြင်း " -"ကိရိယာများ ပါဝင်သည်။ ဤကိရိယာများကို \"အသွားအလာ ပုံပြောင်းကိရိယာများ\" ဟု " +"ကိရိယာများ ပါဝင်သည်။ ဤကိရိယာများကို \"အသွားအလာ အသွင်ပြောင်းကိရိယာများ\" ဟု " "ခေါ်သည်။" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "### အသွားအလာ ပုံပြောင်းကိရိယာ အမျိုးအစားများ" +msgstr "### အသွားအလာ အသွင်ပြောင်းကိရိယာ အမျိုးအစားများ" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -806,8 +806,8 @@ msgid "" "Currently there are three pluggable transports available, but more are being" " developed." msgstr "" -"လက်ရှိတွင် အသွားအလာ ပုံပြောင်းကိရိယာ သုံးမျိုးကို ရရှိနိုင်သော်လည်း နောက်ထပ်" -" ရေးဆွဲနေပါသည်။" +"လက်ရှိတွင် အသွားအလာ အသွင်ပြောင်းကိရိယာ သုံးမျိုးကို ရရှိနိုင်သော်လည်း " +"နောက်ထပ် ရေးသားဖန်တီးနေပါသည်။" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0