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

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by teor＠torproject.org 20 Mar '20

20 Mar '20

commit eb2d08a72c165ee941607c1b2cc591fb4b5e631b Merge: 725efb7c9 3aa855dc6 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:24:57 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 .appveyor.yml | 2 +- changes/ticket33643 | 5 +++++ changes/ticket33643_part2 | 3 +++ src/test/testing_common.c | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
by teor＠torproject.org 20 Mar '20

20 Mar '20

commit 42ea03eb7f7e380016ed5440697a81cebe731aa1 Merge: cb69a5a11 ee3d23c05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 18:38:18 2020 -0400 Merge branch 'ticket33643_skip_035' into ticket33643_skip_041 .appveyor.yml | 2 +- changes/ticket33643 | 5 +++++ changes/ticket33643_part2 | 3 +++ src/test/testing_common.c | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --cc .appveyor.yml index 7e08602fe,c4f3d9984..7841b963f --- a/.appveyor.yml +++ b/.appveyor.yml @@@ -95,9 -95,7 +95,9 @@@ test_script $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" - Execute-Bash "VERBOSE=1 make -k -j2 check" + Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } on_finish:

1 0

[tor/master] Merge branch 'maint-0.4.3'
by teor＠torproject.org 20 Mar '20

20 Mar '20

commit 4bb06cae26f060499168c7f94bc546ed2138945c Merge: 52b4b7e49 eb2d08a72 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:25:04 2020 +1000 Merge branch 'maint-0.4.3' .appveyor.yml | 2 +- changes/ticket33643 | 5 +++++ changes/ticket33643_part2 | 3 +++ src/test/testing_common.c | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix erroneous spaces in circuitmux_ewma.c
by nickm＠torproject.org 19 Mar '20

19 Mar '20

commit 52b4b7e49209ba37771e3987a11c1be77f963588 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Mar 19 13:06:40 2020 -0700 Fix erroneous spaces in circuitmux_ewma.c --- src/core/or/circuitmux_ewma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/or/circuitmux_ewma.c b/src/core/or/circuitmux_ewma.c index b50f33528..0dcd22e8a 100644 --- a/src/core/or/circuitmux_ewma.c +++ b/src/core/or/circuitmux_ewma.c @@ -423,7 +423,7 @@ ewma_cmp_cmux(circuitmux_t *cmux_1, circuitmux_policy_data_t *pol_data_1, /* Pick whichever one has the better best circuit */ return compare_cell_ewma_counts(ce1, ce2); } else { - if (ce1 != NULL ) { + if (ce1 != NULL) { /* We only have a circuit on cmux_1, so prefer it */ return -1; } else if (ce2 != NULL) { @@ -609,7 +609,7 @@ cmux_ewma_set_options(const or_options_t *options, /* convert halflife into halflife-per-tick. */ halflife /= EWMA_TICK_LEN; /* compute per-tick scale factor. */ - ewma_scale_factor = exp( LOG_ONEHALF / halflife ); + ewma_scale_factor = exp(LOG_ONEHALF / halflife); log_info(LD_OR, "Enabled cell_ewma algorithm because of value in %s; " "scale factor is %f per %d seconds",

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 19 Mar '20

19 Mar '20

commit e7e63c54e1b6d5016b738dcd2b37a39f23f2f286 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 21:20:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+fr.po | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index a0c847bbda..cf4053caab 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -490,9 +490,8 @@ msgid "" "4. When the download is complete, extract the archive with the command `tar " "-xf [TB archive]` or by using an archive manager." msgstr "" -"4. Une fois le téléchargement terminé, extrayez le fichier compressé avec la" -" commande `tar -xf [fichier compressé du NT]` ou en utilisant un " -"gestionnaire d’archives." +"4. Une fois le téléchargement terminé, extrayez l’archive avec la commande " +"`tar -xf [archive du NT]` ou en utilisant un gestionnaire d’archives." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -2388,11 +2387,15 @@ msgid "" "1. Plug in your removable media and format it. You *must* use macOS Extended" " (Journaled) format." msgstr "" +"1. Branchez votre support amovible et formatez-le. Vous *devez* utiliser le " +"format Mac OS étendu (journalisé) " #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "3. Download the macOS `.dmg` file and save it directly to your media." msgstr "" +"3. Téléchargez le fichier macOS `.dmg` et enregistrez-le directement sur " +"votre support." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2400,12 +2403,16 @@ msgid "" "5. When the download is complete, click the `.dmg` file and begin the " "installation process." msgstr "" +"5. Une fois le téléchargement terminé, cliquez sur le fichier `.dmg` et " +"lancez le processus d’installation." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "" "3. Download the Linux `.tar.xz` file and save it directly to your media." msgstr "" +"3. Téléchargez le fichier Linux `.tar.xz` et enregistrez-le directement sur " +"votre support." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2413,6 +2420,8 @@ msgid "" "5. When the download is complete, extract the archive onto the media as " "well." msgstr "" +"5. Une fois le téléchargement terminé, extrayez aussi l’archive sur le " +"support." #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 19 Mar '20

19 Mar '20

commit 6a3db36b7c931e95d3ef382867eda20996e437d3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 21:20:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fr.po | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 9135fcb980..cf4053caab 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -490,9 +490,8 @@ msgid "" "4. When the download is complete, extract the archive with the command `tar " "-xf [TB archive]` or by using an archive manager." msgstr "" -"4. Une fois le téléchargement terminé, extrayez le fichier compressé avec la" -" commande `tar -xf [fichier compressé du NT]` ou en utilisant un " -"gestionnaire d’archives." +"4. Une fois le téléchargement terminé, extrayez l’archive avec la commande " +"`tar -xf [archive du NT]` ou en utilisant un gestionnaire d’archives." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -2412,8 +2411,8 @@ msgstr "" msgid "" "3. Download the Linux `.tar.xz` file and save it directly to your media." msgstr "" -"3. Téléchargez le fichier Windows `.tar.xz` et enregistrez-le directement " -"sur votre support." +"3. Téléchargez le fichier Linux `.tar.xz` et enregistrez-le directement sur " +"votre support." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2421,8 +2420,8 @@ msgid "" "5. When the download is complete, extract the archive onto the media as " "well." msgstr "" -"5. Une fois le téléchargement terminé, extrayez aussi le fichier compressé " -"sur le support." +"5. Une fois le téléchargement terminé, extrayez aussi l’archive sur le " +"support." #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 19 Mar '20

19 Mar '20

commit 5f5c2114824a6135e8590d16748f4f082cb1c2c9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 20:51:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index d97ee6fab9..a0c847bbda 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2352,8 +2352,8 @@ msgstr "" msgid "" "3. Download the Windows `.exe` file and save it directly to your media." msgstr "" -"3. Téléchargez le fichier .exe pour Windows et enregistrez-le directement " -"sur votre média." +"3. Téléchargez le fichier Windows `.exe` et enregistrez-le directement sur " +"votre support." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2370,8 +2370,8 @@ msgid "" "5. When the download is complete, click the `.exe` file and begin the " "installation process." msgstr "" -"5. Une fois que le téléchargement est terminé, cliquez sur le fichier .exe " -"et lancez le processus d’installation." +"5. Une fois le téléchargement terminé, cliquez sur le fichier `.exe` et " +"lancez le processus d’installation." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 19 Mar '20

19 Mar '20

commit afbe26f66ab5d60d44fa7366cf2a2b0ec523e248 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 20:50:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fr.po | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index d97ee6fab9..9135fcb980 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2352,8 +2352,8 @@ msgstr "" msgid "" "3. Download the Windows `.exe` file and save it directly to your media." msgstr "" -"3. Téléchargez le fichier .exe pour Windows et enregistrez-le directement " -"sur votre média." +"3. Téléchargez le fichier Windows `.exe` et enregistrez-le directement sur " +"votre support." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2370,8 +2370,8 @@ msgid "" "5. When the download is complete, click the `.exe` file and begin the " "installation process." msgstr "" -"5. Une fois que le téléchargement est terminé, cliquez sur le fichier .exe " -"et lancez le processus d’installation." +"5. Une fois le téléchargement terminé, cliquez sur le fichier `.exe` et " +"lancez le processus d’installation." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2388,11 +2388,15 @@ msgid "" "1. Plug in your removable media and format it. You *must* use macOS Extended" " (Journaled) format." msgstr "" +"1. Branchez votre support amovible et formatez-le. Vous *devez* utiliser le " +"format Mac OS étendu (journalisé) " #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "3. Download the macOS `.dmg` file and save it directly to your media." msgstr "" +"3. Téléchargez le fichier macOS `.dmg` et enregistrez-le directement sur " +"votre support." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2400,12 +2404,16 @@ msgid "" "5. When the download is complete, click the `.dmg` file and begin the " "installation process." msgstr "" +"5. Une fois le téléchargement terminé, cliquez sur le fichier `.dmg` et " +"lancez le processus d’installation." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "" "3. Download the Linux `.tar.xz` file and save it directly to your media." msgstr "" +"3. Téléchargez le fichier Windows `.tar.xz` et enregistrez-le directement " +"sur votre support." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2413,6 +2421,8 @@ msgid "" "5. When the download is complete, extract the archive onto the media as " "well." msgstr "" +"5. Une fois le téléchargement terminé, extrayez aussi le fichier compressé " +"sur le support." #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5

1 0

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

19 Mar '20

commit 879bf2731ccbdce5561466daa6c0c29c4ffd2edf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 20:23:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index 75d7f7bafa..4d6348aac0 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3171,8 +3171,8 @@ msgid "" "In theory, only physical access should compromise your system because Gmail " "and similar services should only send the cookie over an SSL link." msgstr "" -"En teoría, solo el acceso físico podría comprometer tu sistema porque Gmail " -"y otros servicios similares utilizan SSL para enviar la cookie." +"En teoría, sólo el acceso físico podría comprometer tu sistema porque Gmail " +"y otros servicios similares deberían usar SSL para enviar la cookie." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -4461,7 +4461,7 @@ msgid "" "If you are unable to connect to an onion service, please see [I cannot reach" " X.onion!](../../onionservices/onionservices-3)." msgstr "" -"Si no puedes conectarte a un servicio cebolla, por favor mira [¡no puedo " +"Si no puedes conectarte a un servicio cebolla, por favor mira [¡No puedo " "entrar en X.onion!](../../onionservices/onionservices-3)." #: https//support.torproject.org/censorship/censorship-7/

1 0

[snowflake/master] Update license
by cohosh＠torproject.org 19 Mar '20

19 Mar '20

commit e521a7217a0888dbb893c64636e841244bbc56c3 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Mar 19 15:40:11 2020 -0400 Update license --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index f700c98..42f6296 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ ================================================================================ Copyright (c) 2016, Serene Han, Arlo Breault -All rights reserved. +Copyright (c) 2019-2020, The Tor Project, Inc Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1 0