August 2020 - tor-commits - lists.torproject.org

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Aug '20

06 Aug '20

commit 66930da6a3a9004574e3ba99ce06d3cfd78661ba Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 6 18:18:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 6a6f679610..cb0cb4edd9 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -2107,6 +2107,8 @@ msgid "" "Torsocks allows you to use many applications in a safer way with [Tor" "](../tor-tor-network-core-tor)." msgstr "" +"يتيح لك Torsocks استخدام العديد من التطبيقات بطريقة أكثر أمانًا مع [Tor" +"](../tor-tor-network-core-tor)." #: https//support.torproject.org/glossary/torsocks/ #: (content/glossary/torsocks/contents+en.lrword.definition) @@ -2114,6 +2116,8 @@ msgid "" "It ensures that DNS requests are handled safely and explicitly rejects any " "[traffic](../traffic) other than TCP from the application you're using." msgstr "" +"يضمن معالجة طلبات DNS بأمان ورفض أي [حركة] (../ حركة المرور) بخلاف TCP من " +"التطبيق الذي تستخدمه بشكل صريح." #: https//support.torproject.org/glossary/tpi/ #: (content/glossary/tpi/contents+en.lrword.term) @@ -2123,7 +2127,7 @@ msgstr "TPI" #: https//support.torproject.org/glossary/tpi/ #: (content/glossary/tpi/contents+en.lrword.definition) msgid "TPI is an acronym for The Tor Project, Inc." -msgstr "" +msgstr "TPI هو اختصار لـ The Tor Project، Inc." #: https//support.torproject.org/glossary/tpo/ #: (content/glossary/tpo/contents+en.lrword.term) @@ -2137,11 +2141,14 @@ msgid "" "hostnames. For example, `trac.tpo` is an abbreviation for " "`trac.torproject.org`." msgstr "" +"غالبًا ما يستخدم الأشخاص في IRC `tpo` لاختصار` torproject.org` عند كتابة " +"أسماء المضيفين. على سبيل المثال ، `trac.tpo` هو اختصار لـ` " +"trac.torproject.org`." #: https//support.torproject.org/glossary/traffic/ #: (content/glossary/traffic/contents+en.lrword.term) msgid "traffic" -msgstr "" +msgstr "حركة السير" #: https//support.torproject.org/glossary/traffic/ #: (content/glossary/traffic/contents+en.lrword.definition) @@ -2149,11 +2156,13 @@ msgid "" "Traffic is the data sent and received by [clients](../client) and " "[servers](../server)." msgstr "" +"حركة المرور هي البيانات التي يرسلها ويستقبلها [العملاء] (../ العميل) و " +"[الخوادم] (../ الخادم)." #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.term) msgid "web browser" -msgstr "" +msgstr "متصفح الإنترنت" #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.definition) @@ -2162,6 +2171,8 @@ msgid "" "for retrieving, presenting, and browsing information resources on the World " "Wide Web." msgstr "" +"متصفح الويب (يشار إليه عادة باسم المتصفح) هو تطبيق برمجي لاسترداد موارد " +"المعلومات وعرضها وتصفحها على شبكة الويب العالمية." #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.definition) @@ -2169,11 +2180,13 @@ msgid "" "Major web browsers include [Firefox](../firefox), Chrome, Internet Explorer," " and Safari." msgstr "" +"تشمل متصفحات الويب الرئيسية [فايرفوكس] (../ فايرفوكس) و كروم و انترنت " +"اكسبلولر و سفاري." #: https//support.torproject.org/glossary/website-mirror/ #: (content/glossary/website-mirror/contents+en.lrword.term) msgid "website mirror" -msgstr "" +msgstr "مرآة الموقع" #: https//support.torproject.org/glossary/website-mirror/ #: (content/glossary/website-mirror/contents+en.lrword.definition)

1 0

[tpo/master] Update membership.html
by gus＠torproject.org 06 Aug '20

06 Aug '20

commit 39781b8974cadf5c239fec51f9b55c99213e7083 Author: Antonela <antonela(a)torproject.org> Date: Thu Aug 6 16:42:31 2020 +0000 Update membership.html --- templates/membership.html | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index bc09d50c..5bf44744 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -105,27 +105,10 @@ <h3 class="col-12 text-primary display-4">{{ _('Green Onion Members') }}</h3> <div class="col-md-6"> <ul class="jobs-ul"> - <li><a href="#">Zcash Foundation</a></li> - <li><a href="#">ProtonMail</a></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="https://duckduckgo.com" title="DuckDuckGo" target="_blank">DuckDuckGo</a></li> </ul> </div> <div class="col-md-6"> - <ul class="jobs-ul"> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - </ul> </div> </div> </div>

1 0

[snowflake-webext/master] Update a trac reference.
by dcf＠torproject.org 06 Aug '20

06 Aug '20

commit c2c3bdb2280a856f3e0d790e89be447404d9251d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 6 11:54:45 2020 -0600 Update a trac reference. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2d8478..2d45948 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Then start an HTTP server in `build/` and navigate to `/embed.html`. ### Preparing to deploy Background information: - * https://bugs.torproject.org/23947#comment:8 + * https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… * https://help.torproject.org/tsa/doc/static-sites/ * https://help.torproject.org/tsa/doc/ssh-jump-host/

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Aug '20

06 Aug '20

commit 1fe6bfd91ab78df4d15a6a7eec395c9fa505dfea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 6 17:48:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index 60cb6d5447..6a6f679610 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -2094,7 +2094,7 @@ msgstr "torrc" #: https//support.torproject.org/glossary/torrc/ #: (content/glossary/torrc/contents+en.lrword.definition) msgid "The core [Tor](../tor-tor-network-core-tor) configuration file." -msgstr "" +msgstr "ملف التكوين [Tor](../tor-tor-network-core-tor) ملف الضبط." #: https//support.torproject.org/glossary/torsocks/ #: (content/glossary/torsocks/contents+en.lrword.term)

1 0

[snowflake-webext/master] Update bug-reporting instructions.
by dcf＠torproject.org 06 Aug '20

06 Aug '20

commit bbf3629ec21123add37193904f270b06f38c8eb2 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Aug 5 23:34:50 2020 -0600 Update bug-reporting instructions. Option 1 is to request an account at gitlab.torproject.org. Option 2 is to edit the public pad I just created. Closes #14. --- static/index.html | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/static/index.html b/static/index.html index 32cdcde..25f15d7 100644 --- a/static/index.html +++ b/static/index.html @@ -76,24 +76,25 @@ <h2 data-msgid="__MSG_reportingBugs__">Reporting Bugs</h2> <p data-msgid="__MSG_fileBug__">If you encounter problems with Snowflake as a client or a proxy, - please consider filing a bug. To do so, you will have to,</p> + please consider filing a bug report. There are two ways to file a bug report:</p> <ol> - <li data-msgid="__MSG_sharedAccount__"> - Either <a href="https://trac.torproject.org/projects/tor/register">create an - account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a> - using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li> <li data-msgid="__MSG_bugTracker__"> - <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> - using our bug tracker.</li> + <a href="https://gitlab.torproject.org/">Request an account</a> + at the Tor Project GitLab, then + <a href="https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> + in the Snowflake project. + </li> + <li data-msgid="__MSG_sharedAccount__"> + Edit the + <a href="https://pad.riseup.net/p/tor-anti-censorship-bugs-keep">public bug-reporting pad</a> + of the anti-censorship team. + </li> </ol> <p data-msgid="__MSG_descriptive__"> Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug. - Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> - to let us know how which part of the Snowflake system is experiencing - problems. </p> </section>

1 0

[tor/maint-0.3.5] Copy from master gitlab-ci.yml from master back to maint-0.3.5
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit bac8967e244e6dca0d7795bdd0cf6c49f259bd20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 12:42:14 2020 -0400 Copy from master gitlab-ci.yml from master back to maint-0.3.5 --- .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2d0d55dd4..e8d6c5f418 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +image: debian:stable + before_script: - apt-get update -qq - apt-get upgrade -qy @@ -13,33 +15,3 @@ build: - make check || (e=$?; cat test-suite.log; exit $e) - make install -update: - only: - - schedules - script: - - "apt-get install -y --fix-missing git openssh-client" - - # Run ssh-agent (inside the build environment) - - eval $(ssh-agent -s) - - # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - - ssh-add <(echo "$DEPLOY_KEY") - - # For Docker builds disable host key checking. Be aware that by adding that - # you are susceptible to man-in-the-middle attacks. - # WARNING: Use this only with the Docker executor, if you use it with shell - # you will overwrite your user's SSH config. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - # In order to properly check the server's host key, assuming you created the - # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines - # instead. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - - echo "merging from torgit" - - git config --global user.email "labadmin(a)oniongit.eu" - - git config --global user.name "gitadmin" - - "mkdir tor" - - "cd tor" - - git clone --bare https://git.torproject.org/tor.git - - git push --mirror git@oniongit.eu:network/tor.git

1 0

[tor/maint-0.4.2] Copy from master gitlab-ci.yml from master back to maint-0.3.5
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit bac8967e244e6dca0d7795bdd0cf6c49f259bd20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 12:42:14 2020 -0400 Copy from master gitlab-ci.yml from master back to maint-0.3.5 --- .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2d0d55dd4..e8d6c5f418 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +image: debian:stable + before_script: - apt-get update -qq - apt-get upgrade -qy @@ -13,33 +15,3 @@ build: - make check || (e=$?; cat test-suite.log; exit $e) - make install -update: - only: - - schedules - script: - - "apt-get install -y --fix-missing git openssh-client" - - # Run ssh-agent (inside the build environment) - - eval $(ssh-agent -s) - - # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - - ssh-add <(echo "$DEPLOY_KEY") - - # For Docker builds disable host key checking. Be aware that by adding that - # you are susceptible to man-in-the-middle attacks. - # WARNING: Use this only with the Docker executor, if you use it with shell - # you will overwrite your user's SSH config. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - # In order to properly check the server's host key, assuming you created the - # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines - # instead. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - - echo "merging from torgit" - - git config --global user.email "labadmin(a)oniongit.eu" - - git config --global user.name "gitadmin" - - "mkdir tor" - - "cd tor" - - git clone --bare https://git.torproject.org/tor.git - - git push --mirror git@oniongit.eu:network/tor.git

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 352991c843e2c0404fd44178cbf3df32cc365bc1 Merge: 4e684c8695 bac8967e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)

1 0

[tor/maint-0.4.3] Copy from master gitlab-ci.yml from master back to maint-0.3.5
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit bac8967e244e6dca0d7795bdd0cf6c49f259bd20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 12:42:14 2020 -0400 Copy from master gitlab-ci.yml from master back to maint-0.3.5 --- .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2d0d55dd4..e8d6c5f418 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +image: debian:stable + before_script: - apt-get update -qq - apt-get upgrade -qy @@ -13,33 +15,3 @@ build: - make check || (e=$?; cat test-suite.log; exit $e) - make install -update: - only: - - schedules - script: - - "apt-get install -y --fix-missing git openssh-client" - - # Run ssh-agent (inside the build environment) - - eval $(ssh-agent -s) - - # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - - ssh-add <(echo "$DEPLOY_KEY") - - # For Docker builds disable host key checking. Be aware that by adding that - # you are susceptible to man-in-the-middle attacks. - # WARNING: Use this only with the Docker executor, if you use it with shell - # you will overwrite your user's SSH config. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - # In order to properly check the server's host key, assuming you created the - # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines - # instead. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - - echo "merging from torgit" - - git config --global user.email "labadmin(a)oniongit.eu" - - git config --global user.name "gitadmin" - - "mkdir tor" - - "cd tor" - - git clone --bare https://git.torproject.org/tor.git - - git push --mirror git@oniongit.eu:network/tor.git

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 06 Aug '20

06 Aug '20

commit 352991c843e2c0404fd44178cbf3df32cc365bc1 Merge: 4e684c8695 bac8967e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)

1 0