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

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 27 Nov '19

27 Nov '19

commit 66c38b9c5ad404a38ac2611ff9c1cb0e16592949 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 27 00:23:38 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 0f7c2f6d6..795a31bdc 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -11,8 +11,8 @@ # Communia <ameaneantie(a)riseup.net>, 2019 # blueboy, 2019 # Chacal E., 2019 -# m tk, 2019 # Emma Peel, 2019 +# m tk, 2019 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: m tk, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -947,6 +947,8 @@ msgid "" "See this visualization of [Tor and HTTPS](/https/https-1/) to understand how" " Tor and HTTPS interact." msgstr "" +"Acesse esta visualização do [Tor e do HTTPS](/https/https-1/) para entender " +"como eles se interagem." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.title) @@ -983,6 +985,8 @@ msgid "" "Tor Browser can't do anything about the text that you type into forms, " "though." msgstr "" +"O Navegador Tor, porém, não consegue fazer nada em relação ao texto que você" +" digita nos formulários." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.title) @@ -1013,6 +1017,10 @@ msgid "" "watching your Internet connection from learning what sites you visit, and it" " prevents the sites you visit from learning your physical location." msgstr "" +"Isso te protege retransmitindo suas comunicações em uma rede distribuída de " +"[relés](#relé), rodada por pessoas voluntárias ao redor do mundo: evita que " +"alguém que esteja observando sua conexão com a Internet saiba dos sites que " +"você visita, e que estes saibam a sua localização física." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -1075,6 +1083,9 @@ msgid "" " of the actual [onion routing project](https://www.onion-router.net/) run by" " the Naval Research Lab." msgstr "" +"Mesmo se o roteamento da onion se tornar um termo doméstico padrão, o Tor de" +" fato nasceu de um [projeto de roteamento de onion ](http://www.onion-" +"router.net/) feito pelo Naval Research Lab." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1158,6 +1169,8 @@ msgid "" "For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by " "`torbrowser-install-win64-9.0_en-US.exe.asc`." msgstr "" +"Por exemplo, `torbrowser-install-8.0.8_en-US.exe` vem acompanhado de " +"`torbrowser-install-8.0.8_en-US.exe.asc`." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1198,7 +1211,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Installing GnuPG" -msgstr "" +msgstr "### Instalando GnuPG" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1212,7 +1225,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For Windows users:" -msgstr "" +msgstr "#### Para usuários de Windows:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[community/master] Refactor docker installation instructions.
by phw＠torproject.org 26 Nov '19

26 Nov '19

commit d654c53eca0e179ef145c25a36f4917e62c154e7 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Nov 26 15:45:42 2019 -0800 Refactor docker installation instructions. --- .../technical-setup/bridge/docker/contents.lr | 50 +++++++++++++++++----- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 9c7cf44..272afcf 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -17,19 +17,30 @@ docker pull phwinter/obfs4-bridge:latest ### 2. Deploy a container -We provide a Makefile that makes it easy to deploy a container. First, -[download the -Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/Makefile), -and then run: +We provide a Makefile that helps you deploy the container. First, +[download the Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs…, +and then write your bridge configuration to a new file, bridge.sh. Here's a +template: ``` -make deploy OR_PORT=X PT_PORT=Y EMAIL=Z +# Your bridge's Tor port. +export OR_PORT=X +# Your bridge's obfs4 port. +export PT_PORT=Y +# Your email address. +export EMAIL=Z ``` Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure that **both** ports are forwarded in your firewall), and `Z` with your email address, which allows us to get in touch with you if there are problems with your bridge. -If everything worked fine, you should see output similar to the following: +With your bridge configuration in place, you can now deploy the container: + +``` +source bridge.sh && make deploy +``` + +You should now see output similar to the following: ``` 201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108 @@ -37,21 +48,38 @@ Make sure that port X and Y are forwarded in your firewall. ``` That's it! Your container (identified by the first line of output) is now -bootstrapping your new obfs4 bridge. If you want to run more than one bridge on -a single machine, run `make deploy` again, but with a different set of ports. +bootstrapping your new obfs4 bridge. -### 3. Upgrade a container +If you want to run multiple bridges on your machine, you need to create more +bridge configuration files with different sets of ports, and run `make deploy` +again, like so: + +``` +source bridge-1.sh && make deploy +source bridge-2.sh && make deploy +... +``` + +### 3. Upgrade your container To upgrade to the latest version of our image, you need to stop your existing -container, delete it, pull the latest image, and finally deploy it: +container, delete it, pull the latest image, and finally deploy it again: ``` docker stop CONTAINER_ID docker rm CONTAINER_ID docker pull phwinter/obfs4-bridge:latest -make deploy OR_PORT=X PT_PORT=Y EMAIL=Z +source bridge.sh && make deploy ``` +Note that your bridge's data directory (which includes its key material) is +stored in a docker volume, so you won't lose your bridge's identity when +upgrading to the latest docker image. If you are running multiple bridges on +your computer, you need to repeat this step for each bridge. We will announce +new image versions on the +[tor-dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing +list. + ### 4. Monitor your logs You can inspect your bridge's logs by running:

1 0

[community/master] Distinguish between a docker image and container.
by phw＠torproject.org 26 Nov '19

26 Nov '19

commit d32c17df40f1bc0a22d2a452b381c19d30fa2491 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Nov 25 15:28:03 2019 -0800 Distinguish between a docker image and container. --- .../relay-operations/technical-setup/bridge/docker/contents.lr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index ebc4b97..994453c 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -6,18 +6,18 @@ title: Docker --- body: -### 1. Install the container +### 1. Pull the image -We are maintaining a docker container that runs an obfs4 bridge. First, -download the container: +We are maintaining a docker image that runs an obfs4 bridge. First, +download the image: ``` docker pull phwinter/obfs4-bridge:latest ``` -### 2. Deploy the container +### 2. Deploy a container -We provide a Makefile that makes it easy to deploy the container. First, +We provide a Makefile that makes it easy to deploy a container. First, [download the Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs…, and then run:

1 0

[community/master] Add instructions on how to upgrade a container.
by phw＠torproject.org 26 Nov '19

26 Nov '19

commit 17bb36d926b9ad67af4dc7a504c8c36367d4a608 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Nov 26 09:25:21 2019 -0800 Add instructions on how to upgrade a container. --- .../technical-setup/bridge/docker/contents.lr | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index aff4cf2..9c7cf44 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -40,7 +40,19 @@ That's it! Your container (identified by the first line of output) is now bootstrapping your new obfs4 bridge. If you want to run more than one bridge on a single machine, run `make deploy` again, but with a different set of ports. -### 3. Monitor your logs +### 3. Upgrade a container + +To upgrade to the latest version of our image, you need to stop your existing +container, delete it, pull the latest image, and finally deploy it: + +``` +docker stop CONTAINER_ID +docker rm CONTAINER_ID +docker pull phwinter/obfs4-bridge:latest +make deploy OR_PORT=X PT_PORT=Y EMAIL=Z +``` + +### 4. Monitor your logs You can inspect your bridge's logs by running:

1 0

[community/master] Explain how to run multiple containers.
by phw＠torproject.org 26 Nov '19

26 Nov '19

commit a5aebc83ddcccf46e6478b73f9f819516e532780 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Nov 25 15:28:32 2019 -0800 Explain how to run multiple containers. --- content/relay-operations/technical-setup/bridge/docker/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 994453c..aff4cf2 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -37,7 +37,8 @@ Make sure that port X and Y are forwarded in your firewall. ``` That's it! Your container (identified by the first line of output) is now -bootstrapping your new obfs4 bridge. +bootstrapping your new obfs4 bridge. If you want to run more than one bridge on +a single machine, run `make deploy` again, but with a different set of ports. ### 3. Monitor your logs

1 0

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

26 Nov '19

commit 1345da569c23d43fb5e8bd40ab534e44d415163c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 26 22:23:43 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fa.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index da9d39bf5..b3130e03b 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -10,7 +10,8 @@ # MYZJ, 2019 # Saba Rostami <saba(a)asl19.org>, 2019 # Ali A D, 2019 -# Reza Ghasemi, 2019 +# magnifico, 2019 +# Samaneh M <asamana.haoma(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -18,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Reza Ghasemi, 2019\n" +"Last-Translator: Samaneh M <asamana.haoma(a)gmail.com>, 2019\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,16 +48,16 @@ msgstr "" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "We are the Tor Project, a 501(c)3 US nonprofit." -msgstr "ما پروژه تور هستیم، یک سازمان غیر انتفاعی 501(c)3 ایالات متحده است." +msgstr "" +"ما پروژه تور، یک سازمان غیر انتفاعی 501(c)3 در ایالات متحده‌ی آمریکا هستیم." #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "" "We advance human rights and defend your privacy online through free software" " and open networks. [Meet our team](about/people)." msgstr "" -"ما از حقوق انسانی خود دفاع می‌کنیم و از طریق نرم افزار آزاد و شبکه‌های باز " -"از حریم خصوصی خود به صورت آنلاین محافظت می‌کنیم. [دیدار با تیم " -"ما](about/people)." +"ما از پیشرفت حقوق انسانی دفاع می‌کنیم و با نرم افزار آزاد و شبکه‌های باز از " +"حریم خصوصی آنلاین شما محافظت می‌کنیم. [با تیم ما دیدار کنید](about/people)." #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.title)

1 0

[torspec/master] standardize whitespace in the titles
by nickm＠torproject.org 26 Nov '19

26 Nov '19

commit c15cc8a5a869ef82f08e77c79074b892fac55932 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Nov 26 20:29:12 2019 +0100 standardize whitespace in the titles This is one small step towards making these a standard, parsable format. --- bandwidth-file-spec.txt | 1 + cert-spec.txt | 1 + control-spec.txt | 1 - dir-list-spec.txt | 1 + guard-spec.txt | 1 + padding-spec.txt | 1 + pt-spec.txt | 3 ++- rend-spec-v3.txt | 1 + socks-extensions.txt | 3 ++- 9 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index abcd0a8..7564c4c 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -1,3 +1,4 @@ + Tor Bandwidth File Format juga teor diff --git a/cert-spec.txt b/cert-spec.txt index d4dab2e..9dde874 100644 --- a/cert-spec.txt +++ b/cert-spec.txt @@ -1,3 +1,4 @@ + Ed25519 certificates in Tor 1. Scope and Preliminaries diff --git a/control-spec.txt b/control-spec.txt index b564438..e4d6783 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1,5 +1,4 @@ - TC: A Tor control protocol (Version 1) 0. Scope diff --git a/dir-list-spec.txt b/dir-list-spec.txt index 037319d..56ee0e6 100644 --- a/dir-list-spec.txt +++ b/dir-list-spec.txt @@ -1,3 +1,4 @@ + Tor Directory List Format Tim Wilson-Brown (teor) diff --git a/guard-spec.txt b/guard-spec.txt index e21eaf4..4f2e3d3 100644 --- a/guard-spec.txt +++ b/guard-spec.txt @@ -1,3 +1,4 @@ + Tor Guard Specification Isis Lovecruft diff --git a/padding-spec.txt b/padding-spec.txt index 4c3c152..fe9464c 100644 --- a/padding-spec.txt +++ b/padding-spec.txt @@ -1,3 +1,4 @@ + Tor Padding Specification Mike Perry, George Kadianakis diff --git a/pt-spec.txt b/pt-spec.txt index 9ec1e29..121b8c2 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -1,4 +1,5 @@ - Pluggable Transport Specification (Version 1) + + Pluggable Transport Specification (Version 1) Abstract diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt index a3e0b0a..34adfaf 100644 --- a/rend-spec-v3.txt +++ b/rend-spec-v3.txt @@ -1,3 +1,4 @@ + Tor Rendezvous Specification - Version 3 This document specifies how the hidden service version 3 protocol works. This diff --git a/socks-extensions.txt b/socks-extensions.txt index e2fe5da..5fd1f82 100644 --- a/socks-extensions.txt +++ b/socks-extensions.txt @@ -1,4 +1,5 @@ -Tor's extensions to the SOCKS protocol + + Tor's extensions to the SOCKS protocol 1. Overview

1 0

[torspec/master] remove trailing whitespace `sed -i 's, *$, , ' *.txt`
by nickm＠torproject.org 26 Nov '19

26 Nov '19

commit e899eab17d622e6e55e3319a1aa65764e18f9f5b Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Nov 26 21:52:08 2019 +0100 remove trailing whitespace `sed -i 's, *$,,' *.txt` --- bridgedb-spec.txt | 4 ++-- path-spec.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgedb-spec.txt b/bridgedb-spec.txt index c897226..89f850a 100644 --- a/bridgedb-spec.txt +++ b/bridgedb-spec.txt @@ -231,11 +231,11 @@ are fulfilled as possible within the first few bridges. This list is then truncated to N bridges, if possible. N is currently defined as a piecewise function of the number of bridges in the ring such that: - + / | 1, if len(ring) < 20 | - N = | 2, if 20 <= len(ring) <= 100 + N = | 2, if 20 <= len(ring) <= 100 | | 3, if 100 <= len(ring) \ diff --git a/path-spec.txt b/path-spec.txt index a79a4d6..82f07cd 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -672,7 +672,7 @@ of their choices. threat model. It also allows targeted attacks aimed at monitoring the activity of specific users, bridges, or Guard nodes. - There are two points where path selection can be manipulated: + There are two points where path selection can be manipulated: during construction, and during usage. Circuit construction can be manipulated by inducing circuit failures during circuit extend steps, which causes the Tor client to transparently retry

1 0

[torspec/master] fix erroneous header numbering punctuation
by nickm＠torproject.org 26 Nov '19

26 Nov '19

commit a3fd19302312d44257f175bded3551bc1397ced6 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Nov 26 20:58:54 2019 +0100 fix erroneous header numbering punctuation The clear standard is trailing "." after each numeric section. This fixes the small handful of outliers. This makes it easy to convert these headers to common markup formats, for example: http://hyperpolyglot.org/lightweight-markup --- bandwidth-file-spec.txt | 4 ++-- cert-spec.txt | 2 +- control-spec.txt | 2 +- dir-list-spec.txt | 6 +++--- dir-spec.txt | 4 ++-- gettor-spec.txt | 6 +++--- glossary.txt | 34 +++++++++++++++++----------------- padding-spec.txt | 2 +- path-spec.txt | 2 +- pt-spec.txt | 2 +- srv-spec.txt | 4 ++-- tor-fw-helper-spec.txt | 2 +- tor-spec.txt | 2 +- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index 7564c4c..5a2954c 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -33,7 +33,7 @@ Nick Mathewson (nickm) Iain Learmonth (irl) -1.3 Outline +1.3. Outline The Tor directory protocol (dir-spec.txt [3]) sections 3.4.1 and 3.4.2, use the term bandwidth measurements, to refer to what @@ -644,7 +644,7 @@ 2.4. Implementation details -2.4.1 Writing bandwidth files atomically +2.4.1. Writing bandwidth files atomically To avoid inconsistent reads, implementations SHOULD write bandwidth files atomically. If the file is transferred from another host, it SHOULD be diff --git a/cert-spec.txt b/cert-spec.txt index 9dde874..e96188b 100644 --- a/cert-spec.txt +++ b/cert-spec.txt @@ -23,7 +23,7 @@ signed document is prefixed with a personalization string, which will be different in each case. -1.2 Integer encoding +1.2. Integer encoding Network byte order (big-endian) is used to encode all integer values in Ed25519 certificates unless explicitly specified otherwise. diff --git a/control-spec.txt b/control-spec.txt index e4d6783..ec43516 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -3932,7 +3932,7 @@ 0.4.0.x): Tor could report having internal paths only; see Section 5.6] -5.6 Bootstrap phases reported by older versions of Tor +5.6. Bootstrap phases reported by older versions of Tor These phases were reported by Tor older than 0.4.0.x. For newer versions of Tor, see Section 5.5. diff --git a/dir-list-spec.txt b/dir-list-spec.txt index 56ee0e6..e152c2d 100644 --- a/dir-list-spec.txt +++ b/dir-list-spec.txt @@ -162,7 +162,7 @@ The list header consists of a number of key-value pairs, embedded in C-style comments. -2.2.1 List Header Format +2.2.1. List Header Format "/*" SP+ "type=" Keyword SP+ "*/" SP* NL @@ -234,7 +234,7 @@ Future releases may arbitrarily change the content of this section. Parsers MUST NOT rely on a version increment when the format changes. -2.3.1 List Generation Format +2.3.1. List Generation Format In general, parsers MUST NOT rely on the format of this section. @@ -261,7 +261,7 @@ these lists after parsing them, and applies the DirAuthorityFallbackRate to their weights.) -2.4.1 Directory Entry Format +2.4.1. Directory Entry Format If a directory entry does not conform to this format, the entry SHOULD be ignored by parsers. diff --git a/dir-spec.txt b/dir-spec.txt index 2a38d3b..6fa24f1 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2674,7 +2674,7 @@ IPv4 addresses (two /8 networks) were blocked. The list is encoded as described in section 3.8.2. -3.4.3 Serving bandwidth list files +3.4.3. Serving bandwidth list files If an authority has used a bandwidth list file to generate a vote document it SHOULD make it available at @@ -2969,7 +2969,7 @@ half of the total authorities, and we do not already have it listed with some <id-Ed>, include it, but do not consider its Ed identity canonical. -3.8.0.2 Deciding which descriptors to include +3.8.0.2. Deciding which descriptors to include Deciding which descriptors to include. diff --git a/gettor-spec.txt b/gettor-spec.txt index 5255b76..f40b298 100644 --- a/gettor-spec.txt +++ b/gettor-spec.txt @@ -30,7 +30,7 @@ GetTor instance. Security and privacy considerations should be described on a per transport basis. -2.1 Reference implementation +2.1. Reference implementation We have implemented[0] a compliant GetTor that supports SMTP as a transport. @@ -43,14 +43,14 @@ it should offer the software as a list of packages and their subsequent descriptions. -3.1 SMTP transport security considerations +3.1. SMTP transport security considerations Any GetTor instance that offers SMTP as a transport should optionally implement the checking of DKIM signatures to ensure that email is not forged. Optionally GetTor should take an OpenPGP key from the user and encrypt the response with a blinded message. -3.2 SMTP transport privacy considerations +3.2. SMTP transport privacy considerations Any GetTor instance that offers SMTP as a transport must at least store the requester's address for the time that it takes to process a response. This diff --git a/glossary.txt b/glossary.txt index 767080d..6debe20 100644 --- a/glossary.txt +++ b/glossary.txt @@ -18,18 +18,18 @@ citing them authoritatively. ;) "OPTIONAL" in this document are to be interpreted as described in RFC 2119. -1.0 Commonly used Tor configuration terms +1.0. Commonly used Tor configuration terms ORPort - Onion Router Port DirPort - Directory Port -2.0 Tor network components +2.0. Tor network components - 2.1 Relays, aka OR (onion router) +2.1. Relays, aka OR (onion router) [Style guide: prefer the term "Relay"] - 2.1.1 Specific roles +2.1.1. Specific roles Exit relay: The final hop in an exit circuit before traffic leaves the Tor network to connect to external servers. @@ -57,11 +57,11 @@ citing them authoritatively. ;) Each party builds a three-hop circuit, meeting at the rendezvous point. - 2.2 Client, aka OP (onion proxy) +2.2. Client, aka OP (onion proxy) [Style: the "OP" and "onion proxy" terms are deprecated.] - 2.3 Authorities: +2.3. Authorities: Directory Authority: Nine total in the Tor network, operated by trusted individuals. Directory authorities define and serve the @@ -79,7 +79,7 @@ citing them authoritatively. ;) the client can ask any directory cache that's listed in the directory information it has.) - 2.4 Hidden Service: +2.4. Hidden Service: A hidden service is a server that will only accept incoming connections via the hidden service protocol. Connection @@ -87,7 +87,7 @@ citing them authoritatively. ;) service, allowing the hidden service to receive incoming connections, serve content, etc, while preserving its location anonymity. - 2.5 Circuit: +2.5. Circuit: An established path through the network, where cryptographic keys are negotiated using the ntor protocol or TAP (Tor Authentication @@ -104,29 +104,29 @@ citing them authoritatively. ;) network. For example, a client could connect to a hidden service via an internal circuit. - 2.6 Edge connection: +2.6. Edge connection: - 2.7 Consensus: The state of the Tor network, published every hour, +2.7. Consensus: The state of the Tor network, published every hour, decided by a vote from the network's directory authorities. Clients fetch the consensus from directory authorities, fallback directories, or directory caches. - 2.8 Descriptor: Each descriptor represents information about one +2.8. Descriptor: Each descriptor represents information about one relay in the Tor network. The descriptor includes the relay's IP address, public keys, and other data. Relays send descriptors to directory authorities, who vote and publish a summary of them in the network consensus. -3.0 Tor network protocols +3.0. Tor network protocols - 3.1 Link handshake +3.1. Link handshake The link handshake establishes the TLS connection over which two Tor participants will send Tor cells. This handshake also authenticates the participants to each other, possibly using Tor cells. - 3.2 Circuit handshake +3.2. Circuit handshake Circuit handshakes establish the hop-by-hop onion encryption that clients use to tunnel their application traffic. The @@ -155,12 +155,12 @@ citing them authoritatively. ;) contains the first part of the TAP or ntor key establishment handshake. - 3.3 Hidden Service Protocol +3.3. Hidden Service Protocol - 3.4 Directory Protocol +3.4. Directory Protocol -4.0 General network definitions +4.0. General network definitions Leaky Pipe Topology: The ability for the origin of a circuit to address relay cells to be addressed to any hop in the path of a circuit. In Tor, diff --git a/padding-spec.txt b/padding-spec.txt index fe9464c..b3e401a 100644 --- a/padding-spec.txt +++ b/padding-spec.txt @@ -406,7 +406,7 @@ the anonymity and load-balancing implications of their choices. depend on the type of guard used and are not an effective fingerprint for a network/guard-level adversary. -3.3.2 Client-side onion service introduction circuit obfuscation +3.3.2. Client-side onion service introduction circuit obfuscation Two circuit padding machines work to hide client-side introduction circuits: one machine at the origin, and one machine at the second hop of the circuit. diff --git a/path-spec.txt b/path-spec.txt index 15d9a3b..a79a4d6 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -363,7 +363,7 @@ of their choices. Since version 0.2.2.8-alpha, Tor attempts to learn when to give up on circuits based on network conditions. -2.4.1 Distribution choice and parameter estimation +2.4.1. Distribution choice and parameter estimation Based on studies of build times, we found that the distribution of circuit build times appears to be a Frechet distribution. However, diff --git a/pt-spec.txt b/pt-spec.txt index 121b8c2..bd4aec6 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -626,7 +626,7 @@ Table of Contents LOG SEVERITY=debug MESSAGE="Connected to bridge A" -3.3.5 Pluggable Transport Status Message +3.3.5. Pluggable Transport Status Message This message is for a client or server PT to be able to signal back to the parent process via stdout or stderr any status messages. diff --git a/srv-spec.txt b/srv-spec.txt index eaf2bda..6916020 100644 --- a/srv-spec.txt +++ b/srv-spec.txt @@ -224,7 +224,7 @@ Tor works. This text used to be proposal 250-commit-reveal-consensus.txt. Now we go through the phases of the protocol: -3.1 Commitment Phase [COMMITMENTPHASE] +3.1. Commitment Phase [COMMITMENTPHASE] The commit phase lasts from 00:00UTC to 12:00UTC. @@ -257,7 +257,7 @@ Tor works. This text used to be proposal 250-commit-reveal-consensus.txt. authoritative commits they have received from each authority. Only one commit per authority must be considered trusted and active at a given time. -3.2 Reveal Phase +3.2. Reveal Phase The reveal phase lasts from 12:00UTC to 00:00UTC. diff --git a/tor-fw-helper-spec.txt b/tor-fw-helper-spec.txt index fdc34b1..f842953 100644 --- a/tor-fw-helper-spec.txt +++ b/tor-fw-helper-spec.txt @@ -20,7 +20,7 @@ tor-fw-helper is a program that implements basic port forwarding requests; it may be used alone or called from Tor itself. -2.1 Output format +2.1. Output format 2.1.1. Motivation diff --git a/tor-spec.txt b/tor-spec.txt index 21abfdf..0d8ca10 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1907,7 +1907,7 @@ see tor-design.pdf. RELAY_DATA cell within one increment window. In other word, every 100 cells (increment), random bytes should be introduced in at least one cell. -7.3.1 SENDME Cell Format +7.3.1. SENDME Cell Format A circuit-level RELAY_SENDME cell always has its StreamID=0.

1 0

[tor-browser-build/master] Bug 25101: Add support for generating nightly incremental mars
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit d4460a92659808f8d29547197e23cb6defcf2f35 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 18 19:19:12 2019 +0100 Bug 25101: Add support for generating nightly incremental mars --- Makefile | 5 +++++ README.MAKEFILE | 14 +++++++++++++- projects/release/hash_incrementals | 6 +++++- projects/release/update_responses_config | 11 ++++++----- projects/release/update_responses_config.yml | 5 +++-- rbm.conf | 19 +++++++++++++++++++ tools/update-responses/update_responses | 3 ++- 7 files changed, 53 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 6edb7e3..6d82f93 100644 --- a/Makefile +++ b/Makefile @@ -164,6 +164,11 @@ incrementals-alpha: submodule-update tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha +incrementals-nightly: submodule-update + $(rbm) build release --step update_responses_config --target nightly + NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly + $(rbm) build release --step hash_incrementals --target nightly + update_responses-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed $(rbm) build release --step create_update_responses_tar --target release --target signed diff --git a/README.MAKEFILE b/README.MAKEFILE index e07224e..62b54df 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -82,7 +82,19 @@ build number defined as var/torbrowser_version and var/torbrowser_build. incrementals-{release,alpha} ---------------------------- Create incremental mar files for an unsigned build in the release or -alpha channel. +alpha channel. The list of versions we create incrementals from is +defined as var/torbrowser_incremental_from in rbm.conf. + +incrementals-nightly +-------------------- +Create incremental mar files for the current nightly build. The number +of previous versions we should generate incremental mars from is defined +as var/max_torbrowser_incremental_from in rbm.conf. + +If you want to create incremental mars for a version that is not the +current one, you can define the environment variable +TORBROWSER_NIGHTLY_VERSION to the version you want to generate +incremental mars for. dmg2mar-{release,alpha) ----------------------- diff --git a/projects/release/hash_incrementals b/projects/release/hash_incrementals index 9cf1b27..ba95ac7 100644 --- a/projects/release/hash_incrementals +++ b/projects/release/hash_incrementals @@ -1,4 +1,8 @@ #!/bin/bash [% c("var/set_default_env") -%] -cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %] +[% IF c("var/nightly") -%] + cd [% shell_quote(path(dest_dir)) %]/[% c("version") %] +[% ELSE -%] + cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %] +[% END -%] sha256sum `ls -1 | grep '\.incremental\.mar$' | sort` > sha256sums-[% c("var/signed_status") %]-build.incrementals.txt diff --git a/projects/release/update_responses_config b/projects/release/update_responses_config index 4ff470d..ce1d846 100644 --- a/projects/release/update_responses_config +++ b/projects/release/update_responses_config @@ -4,8 +4,9 @@ cat > [% shell_quote(c("basedir")) %]/tools/update-responses/config.yml << 'EOF' [% INCLUDE update_responses_config.yml -%] EOF -# Update / create symlink $torbrowser_version -> $torbrowser_version-buildN -versiondir=[% shell_quote(path(dest_dir)) _ '/' _ c("var/signed_status") _ '/' _ c("version") %] -test -L "$versiondir" && rm -f "$versiondir" -test -d "$versiondir" || ln -s [% shell_quote(c("version")) %]-[% shell_quote(c("var/torbrowser_build")) %] "$versiondir" - +[% IF ! c("var/nightly") -%] + # Update / create symlink $torbrowser_version -> $torbrowser_version-buildN + versiondir=[% shell_quote(path(dest_dir)) _ '/' _ c("var/signed_status") _ '/' _ c("version") %] + test -L "$versiondir" && rm -f "$versiondir" + test -d "$versiondir" || ln -s [% shell_quote(c("version")) %]-[% shell_quote(c("var/torbrowser_build")) %] "$versiondir" +[% END -%] diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index f2542d6..85a1d43 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -5,7 +5,7 @@ appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win32: torbrowser-install appname_bundle_win64: torbrowser-install-win64 -releases_dir: [% path(c('output_dir')) %]/signed +releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %] download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../keyring/torbrowser.gpg @@ -31,7 +31,8 @@ versions: platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] detailsURL: https://blog.torproject.org/new-release-tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %] incremental_from: -[% FOREACH v IN c("var/torbrowser_incremental_from") -%] +[% SET incr_from = c("var/nightly") ? c("var_p/nightly_torbrowser_incremental_from") : c("var/torbrowser_incremental_from"); + FOREACH v IN incr_from -%] - [% v %] [% END -%] migrate_archs: diff --git a/rbm.conf b/rbm.conf index 15d8ef1..cb5e972 100644 --- a/rbm.conf +++ b/rbm.conf @@ -154,6 +154,7 @@ targets: - es-ES - fr - ru + max_torbrowser_incremental_from: 2 torbrowser-testbuild: - testbuild @@ -521,5 +522,23 @@ ENV: $version = sprintf("tbb-nightly.%u.%02u.%02u", $year + 1900, $mon + 1, $day); return $version; }, + nightly_torbrowser_incremental_from => sub { + my ($project, $options) = @_; + my $nightly_dir = project_config($project, 'basedir', $options) . '/nightly'; + my $current_version = project_config($project, 'var/torbrowser_version', $options); + use Path::Tiny; + return [] unless -d $nightly_dir; + my @dirs = sort map { $_->basename } path($nightly_dir)->children(qr/^tbb-nightly\./); + my $nb_incr = project_config($project, ['var', 'max_torbrowser_incremental_from'], $options); + my @res; + while ($nb_incr > 0) { + my $dir = pop @dirs; + last unless $dir; + next if $dir eq $current_version; + $nb_incr--; + push @res, $dir; + } + return [@res]; + }, }, ) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 59cd2ef..3dfd05d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -220,7 +220,8 @@ sub create_incremental_mar { extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B", $mar_c_new); # bug 26054: make sure previous macOS version is code signed - if (($os eq 'osx64') && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") { + if (!$ENV{NO_CODESIGNATURE} && ($os eq 'osx64') + && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") { exit_error "Missing code signature in $from_version while creating $mar_file"; } if ($ENV{CHECK_CODESIGNATURE_EXISTS}) {

1 0