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

[depictor/master] Correct a couple typos/comments
by tom＠torproject.org 28 Jan '20

28 Jan '20

commit 0f0dccd2ed5152fd26df3a38d09a04810fd70ae8 Author: Tom Ritter <tom(a)ritter.vg> Date: Tue Jan 28 14:26:16 2020 +0100 Correct a couple typos/comments --- graphs.py | 2 +- write_website.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphs.py b/graphs.py index 5d60074..482fd20 100755 --- a/graphs.py +++ b/graphs.py @@ -2,7 +2,7 @@ # See LICENSE for licensing information """ -processoduces an HTML file for easily viewing voting and consensus differences +Produces an HTML file for easily viewing voting and consensus differences Ported from Java version Doctor """ diff --git a/write_website.py b/write_website.py index 4f6224e..6ca9d3c 100755 --- a/write_website.py +++ b/write_website.py @@ -34,7 +34,7 @@ from graphs import GraphWriter #Also make sure to define the list of bwauths in the consensus.cfg file -#stem.descriptor.remote.DIRECTORY_AUTHORITIES = { +#stem.directory.DIRECTORY_AUTHORITIES = { #'Faravahar': DirectoryAuthority( # nickname = 'Faravahar', # address = '154.35.175.225',

1 0

[tor/master] Run doxygen makefile target on Travis
by nickm＠torproject.org 28 Jan '20

28 Jan '20

commit f1c50a0e75b22ff3b527e2df5cb451d45bc70618 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Jan 22 19:42:47 2020 +0800 Run doxygen makefile target on Travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index ccd2107fd..23c770f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,8 @@ matrix: os: osx ## We clone our stem repo and run `make test-stem` - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ## We run `make doxygen` without `make check`. + - env: SKIP_MAKE_CHECK="yes" DOXYGEN="yes" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. @@ -129,6 +131,7 @@ addons: - docbook-xsl - docbook-xml - xmlto + - doxygen ## Utilities ## preventing or diagnosing hangs - timelimit @@ -233,6 +236,7 @@ script: ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes ## Travis will kill the job after 10 minutes with no output - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE --log-file stem.log; fi + - if [[ "$DOXYGEN" != "" ]]; then make doxygen; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi

1 0

[tor/master] Add changes file
by nickm＠torproject.org 28 Jan '20

28 Jan '20

commit a207fd7226c63c97fbf375a5e4c47773d00be393 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Jan 22 20:25:30 2020 +0800 Add changes file --- changes/ticket32455 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changes/ticket32455 b/changes/ticket32455 new file mode 100644 index 000000000..3fa3b3e98 --- /dev/null +++ b/changes/ticket32455 @@ -0,0 +1,2 @@ + o Minor features (continuous integration): + - Run Doxygen Makefile target on Travis. Closes ticket 32455.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1680'
by nickm＠torproject.org 28 Jan '20

28 Jan '20

commit 99671c0dae42b3b7ffbccada518d241641773bb2 Merge: 27099ffe6 a207fd722 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 28 08:15:21 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1680' .travis.yml | 4 ++++ changes/ticket32455 | 2 ++ 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1689'
by nickm＠torproject.org 28 Jan '20

28 Jan '20

commit 27099ffe6a6db70f08bd1d06b602d7313053c399 Merge: aba31e218 9d771ccc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 28 07:55:34 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1689' .travis.yml | 2 -- changes/ticket33075 | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/master] Travis: Stop allowing stem test failures
by nickm＠torproject.org 28 Jan '20

28 Jan '20

commit 9d771ccc86a7b8f04a40d619b78f7d99f67c176f Author: teor <teor(a)torproject.org> Date: Tue Jan 28 19:55:35 2020 +1000 Travis: Stop allowing stem test failures Stop allowing failures on the Travis CI stem tests job. It looks like all the stem hangs we were seeing are now fixed, but let's make sure we see them if they happen again. Closes ticket 33075. --- .travis.yml | 2 -- changes/ticket33075 | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f7e7a572..28a45788b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,8 +93,6 @@ matrix: os: osx - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx - ## test-stem sometimes hangs on Travis - - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic diff --git a/changes/ticket33075 b/changes/ticket33075 new file mode 100644 index 000000000..69698d90b --- /dev/null +++ b/changes/ticket33075 @@ -0,0 +1,4 @@ + o Testing: + - Stop allowing failures on the Travis CI stem tests job. It looks like all + the stem hangs we were seeing are now fixed, but let's make sure we see + them if they happen again. Closes ticket 33075.

1 0

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

28 Jan '20

commit 71d4dccd421185071e1806d8f570cdb8095b7806 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 10:54:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index b9bae12ebb..642acd6c89 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2313,7 +2313,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "Both options are located in the hamburger menu." -msgstr "" +msgstr "Ambas opciones están ubicadas en el 'menú hamburguesa'." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description)

1 0

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

28 Jan '20

commit 4509a818d3858c232464fc088885323f9f6104d8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 10:23:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index 515dd1b065..b9bae12ebb 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1550,6 +1550,9 @@ msgid "" "sizes and this makes it harder to single out users on basis of screen size, " "as many users will have same screen size." msgstr "" +"En pocas palabras, esta técnica crea grupos de usuarios con el mismo tamaño " +"de ventanas, y esto hace más difícil que se puedan identificar basándose en " +"tamaño de pantalla, ya que muchos usuarios tendrán el mismo tamaño." #: https//support.torproject.org/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.title) @@ -2036,6 +2039,11 @@ msgid "" "parameters) and [paper](https://www-" "users.cs.umn.edu/~hoppernj/single_guard.pdf) on entry guards." msgstr "" +"Para más información sobre cómo funcionan los repetidores guardián, mira " +"este [artículo del blog](https://blog.torproject.org/improving-tors-" +"anonymity-changing-guard-parameters) y este [documento técnico](https" +"://www-users.cs.umn.edu/~hoppernj/single_guard.pdf) sobre guardianes de " +"entrada." #: https//support.torproject.org/tbb/tbb-20/ #: (content/tbb/tbb-20/contents+en.lrquestion.title) @@ -6434,8 +6442,8 @@ msgid "" "You should not install any additional add-ons on Tor Browser because that " "can compromise some of its privacy features." msgstr "" -"No debes de instalar ningún add-on más en Tor ya que eso podría comprometer" -" tu privacidad." +"No debes de instalar ningún add-on más en Tor Browser, ya que podría " +"comprometer tu privacidad." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6776,6 +6784,8 @@ msgid "" "For more information, see [how you can verify signatures](/tbb/how-to-" "verify-signature/)." msgstr "" +"Para más información lee [como verificar firmas](/es/tbb/how-to-verify-" +"signature/)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6941,6 +6951,15 @@ msgid "" "network/-core-tor) because their firewall blocks Tor connections. You can " "reconfigure or disable your firewall and restart Tor to test this." msgstr "" +"Un firewall es un sistema de seguridad de red que monitorea y controla el " +"[traffic](#traffic) entrante y saliente de la red. Este filtro de tráfico se" +" basa en reglas predeterminadas. Un firewall suele establecer una barrera " +"entre una red interna segura y de confianza y otra red externa, pero también" +" puede utilizarse como filtro de contenido en el sentido de [censorship" +"](#network-censorship). A veces la gente tiene problemas para conectarse a " +"[Tor](#tor-/-tor-network/-core-tor) porque su firewall bloquea las " +"conexiones Tor. Puedes reconfigurar o desactivar tu cortafuegos y reiniciar " +"Tor para probar esto." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[snowflake/master] Fix the order of arguments of client copyLoop to match the call.
by dcf＠torproject.org 28 Jan '20

28 Jan '20

commit bc5498cb4b605f4e0777b6348738ace89f88f953 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 28 02:55:17 2020 -0700 Fix the order of arguments of client copyLoop to match the call. The call was copyLoop(socks, snowflake) but the function signature was func copyLoop(WebRTC, SOCKS io.ReadWriter) { The mistake was mostly harmless, because both arguments were treated the same, except that error logs would have reported the wrong direction. --- client/lib/snowflake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 2e68e36..50070af 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -48,7 +48,7 @@ func Handler(socks SocksConnector, snowflakes SnowflakeCollector) error { // Exchanges bytes between two ReadWriters. // (In this case, between a SOCKS and WebRTC connection.) -func copyLoop(WebRTC, SOCKS io.ReadWriter) { +func copyLoop(SOCKS, WebRTC io.ReadWriter) { var wg sync.WaitGroup wg.Add(2) go func() {

1 0

[snowflake/master] Use lowercase variable names in copyLoop.
by dcf＠torproject.org 28 Jan '20

28 Jan '20

commit 57d4b0b5bdac10875e8f57cca71a37a74d42f387 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 28 03:01:48 2020 -0700 Use lowercase variable names in copyLoop. --- client/lib/snowflake.go | 6 +++--- server-webrtc/snowflake.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 50070af..a27c6a5 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -48,17 +48,17 @@ func Handler(socks SocksConnector, snowflakes SnowflakeCollector) error { // Exchanges bytes between two ReadWriters. // (In this case, between a SOCKS and WebRTC connection.) -func copyLoop(SOCKS, WebRTC io.ReadWriter) { +func copyLoop(socks, webRTC io.ReadWriter) { var wg sync.WaitGroup wg.Add(2) go func() { - if _, err := io.Copy(SOCKS, WebRTC); err != nil { + if _, err := io.Copy(socks, webRTC); err != nil { log.Printf("copying WebRTC to SOCKS resulted in error: %v", err) } wg.Done() }() go func() { - if _, err := io.Copy(WebRTC, SOCKS); err != nil { + if _, err := io.Copy(webRTC, socks); err != nil { log.Printf("copying SOCKS to WebRTC resulted in error: %v", err) } wg.Done() diff --git a/server-webrtc/snowflake.go b/server-webrtc/snowflake.go index acdf5b1..9ca82cb 100644 --- a/server-webrtc/snowflake.go +++ b/server-webrtc/snowflake.go @@ -21,17 +21,17 @@ var ptMethodName = "snowflake" var ptInfo pt.ServerInfo var logFile *os.File -func copyLoop(WebRTC, ORPort net.Conn) { +func copyLoop(webRTC, orPort net.Conn) { var wg sync.WaitGroup wg.Add(2) go func() { - if _, err := io.Copy(ORPort, WebRTC); err != nil { + if _, err := io.Copy(orPort, webRTC); err != nil { log.Printf("copy WebRTC to ORPort error in copyLoop: %v", err) } wg.Done() }() go func() { - if _, err := io.Copy(WebRTC, ORPort); err != nil { + if _, err := io.Copy(webRTC, orPort); err != nil { log.Printf("copy ORPort to WebRTC error in copyLoop: %v", err) } wg.Done()

1 0