[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 1395ebd5463af50c51f2cccff66f2ff8c7d85d63 Author: Translation commit bot Date: Wed Nov 4 07:45:02 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- sq/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/aboutTor.dtd b/sq/aboutTor.dtd index ddaf0cb8ad..2dbccce745 100644 --- a/sq/aboutTor.dtd +++ b/sq/aboutTor.dtd @@ -33,4 +33,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 49b788a83422bd7103fadd7e9224ccd6c37aafec Author: Translation commit bot Date: Wed Nov 4 06:45:03 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- es-AR/aboutTor.dtd | 2 +- es-ES/aboutTor.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es-AR/aboutTor.dtd b/es-AR/aboutTor.dtd index 6ef4e3aeeb..4e96cdcf2e 100644 --- a/es-AR/aboutTor.dtd +++ b/es-AR/aboutTor.dtd @@ -33,4 +33,4 @@ - + diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd index 61103343b0..f835df23c8 100644 --- a/es-ES/aboutTor.dtd +++ b/es-ES/aboutTor.dtd @@ -33,4 +33,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 5b64c777a2b886fc9fdfc652c2e90dfc94023cd1 Author: Translation commit bot Date: Wed Nov 4 02:45:02 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- tr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 9f3d581f0b..15af6a32bc 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -33,4 +33,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
commit a63f87e08d47c3acd33801be9bae37223f279d77 Author: Translation commit bot Date: Wed Nov 4 02:45:05 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed --- tr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 69a1cbe7c6..15af6a32bc 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -33,4 +33,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 34aff441634806e207cd4a06383c4d7e739eb558 Author: Translation commit bot Date: Wed Nov 4 02:15:03 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- pt-BR/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt-BR/aboutTor.dtd b/pt-BR/aboutTor.dtd index 364ca947a8..cf2705f630 100644 --- a/pt-BR/aboutTor.dtd +++ b/pt-BR/aboutTor.dtd @@ -34,4 +34,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 1f1a01650779cba656b77e8a21b913a92009c28f Author: Translation commit bot Date: Tue Nov 3 23:15:28 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ar/aboutTor.dtd| 1 + bg/aboutTor.dtd| 1 + bn-BD/aboutTor.dtd | 1 + ca/aboutTor.dtd| 1 + cs/aboutTor.dtd| 1 + cy/aboutTor.dtd| 1 + da/aboutTor.dtd| 1 + de/aboutTor.dtd| 1 + el/aboutTor.dtd| 1 + en-GB/aboutTor.dtd | 1 + en-US/aboutTor.dtd | 1 + en/aboutTor.dtd| 1 + eo/aboutTor.dtd| 1 + es-AR/aboutTor.dtd | 1 + es-ES/aboutTor.dtd | 1 + es-MX/aboutTor.dtd | 1 + et/aboutTor.dtd| 1 + eu/aboutTor.dtd| 1 + fa/aboutTor.dtd| 1 + fi/aboutTor.dtd| 1 + fr/aboutTor.dtd| 1 + ga-IE/aboutTor.dtd | 1 + he/aboutTor.dtd| 1 + hi-IN/aboutTor.dtd | 1 + hr/aboutTor.dtd| 1 + hu/aboutTor.dtd| 1 + id/aboutTor.dtd| 3 ++- is/aboutTor.dtd| 1 + it/aboutTor.dtd| 1 + ja/aboutTor.dtd| 1 + ka/aboutTor.dtd| 1 + kk/aboutTor.dtd| 1 + ko/aboutTor.dtd| 1 + lt/aboutTor.dtd| 1 + lv/aboutTor.dtd| 1 + mk/aboutTor.dtd| 1 + ml/aboutTor.dtd| 1 + mr/aboutTor.dtd| 1 + ms/aboutTor.dtd| 1 + nb-NO/aboutTor.dtd | 1 + nl-BE/aboutTor.dtd | 1 + nl/aboutTor.dtd| 1 + nn-NO/aboutTor.dtd | 1 + pa-IN/aboutTor.dtd | 1 + pl/aboutTor.dtd| 1 + pt-BR/aboutTor.dtd | 1 + pt-PT/aboutTor.dtd | 1 + ro/aboutTor.dtd| 1 + ru/aboutTor.dtd| 1 + sk/aboutTor.dtd| 1 + sl/aboutTor.dtd| 1 + sq/aboutTor.dtd| 1 + sr/aboutTor.dtd| 1 + sv-SE/aboutTor.dtd | 1 + sw/aboutTor.dtd| 1 + ta/aboutTor.dtd| 1 + th/aboutTor.dtd| 1 + tr/aboutTor.dtd| 1 + uk/aboutTor.dtd| 1 + ur/aboutTor.dtd| 1 + vi/aboutTor.dtd| 1 + zh-CN/aboutTor.dtd | 1 + zh-HK/aboutTor.dtd | 1 + zh-TW/aboutTor.dtd | 1 + 64 files changed, 65 insertions(+), 1 deletion(-) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index ba01471e93..69dc3e1308 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/bg/aboutTor.dtd b/bg/aboutTor.dtd index b486b47103..22e0f8b54e 100644 --- a/bg/aboutTor.dtd +++ b/bg/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/bn-BD/aboutTor.dtd b/bn-BD/aboutTor.dtd index 35fed0f0d1..c714fb0faa 100644 --- a/bn-BD/aboutTor.dtd +++ b/bn-BD/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd index 3d5966fc49..a4d1eb60d9 100644 --- a/ca/aboutTor.dtd +++ b/ca/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd index 43b8f5f90e..2abc16b3b7 100644 --- a/cs/aboutTor.dtd +++ b/cs/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/cy/aboutTor.dtd b/cy/aboutTor.dtd index 6488fca36a..fe0ec38b9b 100644 --- a/cy/aboutTor.dtd +++ b/cy/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd index b711317500..5e6a8f6cfc 100644 --- a/da/aboutTor.dtd +++ b/da/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index 8e82ac2f7f..65e9b4dbed 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd index 400bb4cc78..bf6550528d 100644 --- a/el/aboutTor.dtd +++ b/el/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/en-GB/aboutTor.dtd b/en-GB/aboutTor.dtd index e4ddafc8c2..eb2da37329 100644 --- a/en-GB/aboutTor.dtd +++ b/en-GB/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/en-US/aboutTor.dtd b/en-US/aboutTor.dtd index 13e2d8a2ae..00c8256d1c 100644 --- a/en-US/aboutTor.dtd +++ b/en-US/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd index 13e2d8a2ae..00c8256d1c 100644 --- a/en/aboutTor.dtd +++ b/en/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/eo/aboutTor.dtd b/eo/aboutTor.dtd index bd890a2c42..5938f3183b 100644 --- a/eo/aboutTor.dtd +++ b/eo/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/es-AR/aboutTor.dtd b/es-AR/aboutTor.dtd index c86c5eb82b..6ef4e3aeeb 100644 --- a/es-AR/aboutTor.dtd +++ b/es-AR/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd index 04c2b2bb01..61103343b0 100644 --- a/es-ES/aboutTor.dtd +++ b/es-ES/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/es-MX/aboutTor.dtd b/es-MX/aboutTor.dtd index 8ba10220fa..557f239d6e 100644 --- a/es-MX/aboutTor.dtd +++ b/es-MX/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/et/aboutTor.dtd b/et/aboutTor.dtd index a611fbba5b..6985844322 100644 --- a/et/aboutTor.dtd +++ b/et/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/eu/aboutTor.dtd b/eu/aboutTor.dtd index 8fba9ac70f..f133847296 100644 --- a/eu/aboutTor.dtd +++ b/eu/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/fa/aboutTor.dtd b/fa/aboutTor.dtd index e1e7257b8b..1932829a70 100644 --- a/fa/aboutTor.dtd +++ b/fa/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/fi/aboutTor.dtd b/fi/aboutTor.dtd index 40289832f5..56a5b7c625 100644 ---
[tor-commits] [translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
commit 6dd18b2b66cd23c3dbbf41d0cc3234bb3097d614 Author: Translation commit bot Date: Tue Nov 3 23:15:43 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed --- ar/aboutTor.dtd| 1 + ca/aboutTor.dtd| 1 + cs/aboutTor.dtd| 1 + da/aboutTor.dtd| 1 + de/aboutTor.dtd| 1 + el/aboutTor.dtd| 1 + en-GB/aboutTor.dtd | 1 + en-US/aboutTor.dtd | 1 + en/aboutTor.dtd| 1 + es-AR/aboutTor.dtd | 1 + es-ES/aboutTor.dtd | 1 + fa/aboutTor.dtd| 3 ++- fi/aboutTor.dtd| 1 + fr/aboutTor.dtd| 1 + ga-IE/aboutTor.dtd | 1 + he/aboutTor.dtd| 1 + hr/aboutTor.dtd| 1 + hu/aboutTor.dtd| 1 + id/aboutTor.dtd| 1 + is/aboutTor.dtd| 1 + it/aboutTor.dtd| 1 + ja/aboutTor.dtd| 1 + ka/aboutTor.dtd| 1 + ko/aboutTor.dtd| 1 + lt/aboutTor.dtd| 1 + mk/aboutTor.dtd| 1 + ms/aboutTor.dtd| 1 + nl/aboutTor.dtd| 1 + pl/aboutTor.dtd| 1 + pt-BR/aboutTor.dtd | 1 + pt-PT/aboutTor.dtd | 1 + ro/aboutTor.dtd| 1 + ru/aboutTor.dtd| 1 + sv-SE/aboutTor.dtd | 1 + tr/aboutTor.dtd| 1 + vi/aboutTor.dtd| 1 + zh-CN/aboutTor.dtd | 1 + zh-TW/aboutTor.dtd | 1 + 38 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index b85fb130c3..cc56a75010 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd index 3d5966fc49..0ce1ad78f2 100644 --- a/ca/aboutTor.dtd +++ b/ca/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd index 40385f6bfe..c43611a18c 100644 --- a/cs/aboutTor.dtd +++ b/cs/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd index b711317500..a8b0c0e1b8 100644 --- a/da/aboutTor.dtd +++ b/da/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index 708393caa6..6a276965e4 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd index e72f19974b..01a5beff9c 100644 --- a/el/aboutTor.dtd +++ b/el/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/en-GB/aboutTor.dtd b/en-GB/aboutTor.dtd index 9ffa145ef7..c91e30ad52 100644 --- a/en-GB/aboutTor.dtd +++ b/en-GB/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/en-US/aboutTor.dtd b/en-US/aboutTor.dtd index 9ffa145ef7..c91e30ad52 100644 --- a/en-US/aboutTor.dtd +++ b/en-US/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd index 9ffa145ef7..c91e30ad52 100644 --- a/en/aboutTor.dtd +++ b/en/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/es-AR/aboutTor.dtd b/es-AR/aboutTor.dtd index c86c5eb82b..40a223ef31 100644 --- a/es-AR/aboutTor.dtd +++ b/es-AR/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd index 47630c0697..3232d653ec 100644 --- a/es-ES/aboutTor.dtd +++ b/es-ES/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/fa/aboutTor.dtd b/fa/aboutTor.dtd index 6f96bff560..06ea9fc853 100644 --- a/fa/aboutTor.dtd +++ b/fa/aboutTor.dtd @@ -32,4 +32,5 @@ - + + diff --git a/fi/aboutTor.dtd b/fi/aboutTor.dtd index e819eb9ea3..26ea489ba5 100644 --- a/fi/aboutTor.dtd +++ b/fi/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 4f2d79c6b4..067fdc5792 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/ga-IE/aboutTor.dtd b/ga-IE/aboutTor.dtd index d9d9a5cf15..10a72a7839 100644 --- a/ga-IE/aboutTor.dtd +++ b/ga-IE/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd index 90c2e8f0f4..dec805236c 100644 --- a/he/aboutTor.dtd +++ b/he/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd index 89d2aca9a0..0899fedf31 100644 --- a/hr/aboutTor.dtd +++ b/hr/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd index 9868c50417..c9dcc75019 100644 --- a/hu/aboutTor.dtd +++ b/hu/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/id/aboutTor.dtd b/id/aboutTor.dtd index d2f65dc715..65be25adf6 100644 --- a/id/aboutTor.dtd +++ b/id/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index 0ee39b01fb..da515c8efa 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index 65fb7f496f..27fb0d153f 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd index f1edcec75f..0e31676a20 100644 --- a/ja/aboutTor.dtd +++ b/ja/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd index 7278c63cce..6eca403c3c 100644 --- a/ka/aboutTor.dtd +++ b/ka/aboutTor.dtd @@ -33,3 +33,4 @@ + diff --git a/ko/aboutTor.dtd b/ko/aboutTor.dtd index 9ffa145ef7..c91e30ad52 100644 --- a/ko/aboutTor.dtd +++ b/ko/aboutTor.dtd @@ -33,3 +33,4 @@ + diff
[tor-commits] [torbutton/master] fixup! Bug 40013: End of year 2020 Fundraising campaign
commit 86c73f63b9524b30a9e87018a5f2ecbaec0fd047 Author: Matthew Finkel Date: Tue Nov 3 22:49:36 2020 + fixup! Bug 40013: End of year 2020 Fundraising campaign Bug 40022: EOY November Update - Matching --- chrome/locale/en-US/aboutTor.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd index 13e2d8a2..00c8256d 100644 --- a/chrome/locale/en-US/aboutTor.dtd +++ b/chrome/locale/en-US/aboutTor.dtd @@ -33,3 +33,4 @@ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-securitylevelproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties
commit 96b6380385838f6478d2c04f8ccad65e87c9d2c6 Author: Translation commit bot Date: Tue Nov 3 22:47:42 2020 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties --- ka/securitylevel.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ka/securitylevel.properties b/ka/securitylevel.properties index 8912b2c861..8b36f4eb31 100644 --- a/ka/securitylevel.properties +++ b/ka/securitylevel.properties @@ -1,12 +1,12 @@ securityLevel.securityLevel = á£á¡áá¤á áá®ááááá¡ áááá securityLevel.customWarning = áááááááá£áá -securityLevel.overview = áááááá¨ááá á¨áá¡áá«áááááááááá¡ ááá¬ááá, á áááááá᪠á£á¡áá¤á áá®áááááá á¨áá¢áááááá¡á áá ááá ááá áááááªáááááá¡ á®ááá§áá¤áá¡áááá¡ á¨ááá«áááá áááááá§áááá. +securityLevel.overview = ááá áááá£áá á¨áá¡áá«áááááááááá¡ ááááá¨áá, á áááááá᪠á£á¡áá¤á áá®áááááá á¨áá¢áááááá¡á áá ááá ááá áááááªáááááá¡ á®ááá§áá¤áá¡áááá¡ á¨ááá«áááá áááááá§áááá. securityLevel.standard.level = á©ááá£áááá ááá securityLevel.standard.tooltip = á£á¡áá¤á áá®ááááá¡ áááá : á©ááá£áááá ááá securityLevel.standard.summary = Tor-áá áá£ááá áá¡á áá áááá¡ááá¢áá¡ á§áááá á¨áá¡áá«ááááááá á©áá áá£ááá. securityLevel.safer.level = ááá¢áá áááªá£áá securityLevel.safer.tooltip = á£á¡áá¤á áá®ááááá¡ áááá : áááªá£áá -securityLevel.safer.summary = ááááá¨á£ááá áááá¡ááá¢áá¡ á¡áá¤á áá®áá¡á¨áááªáááá á¨áá¡áá«ááááááááá, á¡áááá áá£ááá á¡ááá¢áááá¡ ááá¬ááá ááá ááá£á¨ááááá¡ ááááá áá£ááá. +securityLevel.safer.summary = ááá¨ááá¡ áááá¡ááá¢áá¡ á¡áá¤á áá®áá¡á¨áááªááá á¨áá¡áá«ááááááááá¡, á¡ááá¢áááá¡ ááá¬ááá, á¡áááá áá£ááá ááá¦áá ááá£á¨ááááá¡ ááááá áá£ááá. securityLevel.safer.description1 = JavaScript ááááá¨á£ááá HTTPS-á¡ áá áá¥ááá á§áááá á¡ááá¢áá. securityLevel.safer.description2 = á¨á áá¤á¢áááá¡á áá ááááááá¢ááá£á á á¡áááááááááá¡ ááá¬ááá ááááá¨á£ááá. securityLevel.safer.description3 = á®áááááá áá áááááá¤áááááá (HTML5), ááá áááá WebGL áá¨áááá áá®áááá ááá¬ááááááá. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
commit d560ecd497d539c1d4bd8dc857ca0ae1795767d0 Author: Translation commit bot Date: Tue Nov 3 22:47:30 2020 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd --- ka/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd index 510a425fd9..4d1ea917e1 100644 --- a/ka/torbutton.dtd +++ b/ka/torbutton.dtd @@ -26,7 +26,7 @@ - + @@ -38,7 +38,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
commit e91a3c282d4203e285686ca65e8f30d82a90695d Author: Translation commit bot Date: Tue Nov 3 22:47:25 2020 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties --- ka/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbutton.properties b/ka/torbutton.properties index 9cdb7cb2bf..c4c7219452 100644 --- a/ka/torbutton.properties +++ b/ka/torbutton.properties @@ -55,7 +55,7 @@ profileMigrationFailed=áá¥áááá áá á¡ááá£áá %S áá á # "Downloading update" string for the hamburger menu (see #28885). # This string is kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -updateDownloadingPanelUILabel=á©ááááá¢ááá áááá %S ááááá®áááá +updateDownloadingPanelUILabel=á©ááááá¢ááá áááá %Sá¡ ááááá®áááá # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=áááá¨áá á ááá¨áá¤á á£ááá (Onion-áááá¡áá®á£á ááá, %1$S, %2$S ááá¢áááá ááá¡áá¦ááááá, %3$S) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit 3a7fb7d665f24a3e86a2b8382f390340ab903bdf Author: Translation commit bot Date: Tue Nov 3 22:45:30 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- ka/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd index 31c9cfefd6..b834f08dd5 100644 --- a/ka/https-everywhere.dtd +++ b/ka/https-everywhere.dtd @@ -27,10 +27,10 @@ - + - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
commit 076acb6528332ec9926bf67dd99b58438900c49c Author: Translation commit bot Date: Tue Nov 3 22:45:25 2020 + https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml --- ka/torbrowser_strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbrowser_strings.xml b/ka/torbrowser_strings.xml index daa78adcfd..60e923d09a 100644 --- a/ka/torbrowser_strings.xml +++ b/ka/torbrowser_strings.xml @@ -66,7 +66,7 @@ á©ááá£áááá ááá Tor-áá áá£ááá áá¡á áá áááá¡ááá¢áá¡ á§áááá á¨áá¡áá«ááááááá á©áá áá£ááá. ááá¢áá áááªá£áá -ááááá¨áá áááá¡ááá¢áá¡ ááá¢áá á¡áá¤á áá®áá¡á¨áááªáááá á¨áá¡áá«áááááááááá¡, á¡áááá áá£ááá á¡ááá¢áááá¡ ááá¬ááá ááá ááá£á¨ááááá¡ ááááá áá£ááá. +ááá¨ááá¡ áááá¡ááá¢áá¡ á¡áá¤á áá®áá¡á¨áááªááá á¨áá¡áá«ááááááááá¡, á¡ááá¢áááá¡ ááá¬ááá, á¡áááá áá£ááá ááá¦áá ááá£á¨ááááá¡ ááááá áá£ááá. á¡á á£áááá áááªá£áá ááá¨áááá áá®áááá ááá¨áá¡áá«áááááááááá¡, á áááááá¡á᪠á¡áááá áááá¡ á£áªááááá á¨áááááá¡áá¡ á¡ááá¢ááá áá ááá á¢ááá áááá¡áá®á£á ááááá. áªááááááááá á¨ááá®ááá á¡á£á ááááá¡, á¤áááááá¡á áá á¡áá ááá¢ááá¡. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-aboutdialogdtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd_completed
commit 9920067d3f1248be4cf7c7bd931c694c6a6b8878 Author: Translation commit bot Date: Tue Nov 3 22:17:18 2020 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd_completed --- ka/aboutdialog.dtd | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ka/aboutdialog.dtd b/ka/aboutdialog.dtd index 487e33bf97..64469f934f 100644 --- a/ka/aboutdialog.dtd +++ b/ka/aboutdialog.dtd @@ -1,19 +1,19 @@ - + - - + + - + - - + + - - + + - + - + - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
commit 537ec101eb9f2d17f02b301b56239fd7e29ea40b Author: Translation commit bot Date: Tue Nov 3 22:17:16 2020 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd --- ka/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/aboutdialog.dtd b/ka/aboutdialog.dtd index 487e33bf97..3320ad188a 100644 --- a/ka/aboutdialog.dtd +++ b/ka/aboutdialog.dtd @@ -3,7 +3,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add eoy redirects
commit e39a1408ff97f4be062adbcf70f41a2d3bcc7063 Author: gus Date: Tue Nov 3 16:03:29 2020 -0500 Add eoy redirects --- .htaccess | 7 +++ 1 file changed, 7 insertions(+) diff --git a/.htaccess b/.htaccess index 91eca4c6..5a59be9c 100644 --- a/.htaccess +++ b/.htaccess @@ -166,3 +166,10 @@ RewriteRule ^donate/donate-tba-tb9(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-tba-tb10(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-ann-usetor-ig(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-ann-usetor-ld(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-bp-fot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tw-fot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fb-fot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ld-fot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ig-fot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-md-fot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-em-fot(.*) https://donate.torproject.org/ [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Merge branch 'friends-of-tor'
commit 5ee0f509c38b6e6d1b363f699aa77ff17eec6268 Merge: 7a25c50e e39a1408 Author: gus Date: Tue Nov 3 16:10:42 2020 -0500 Merge branch 'friends-of-tor' .htaccess | 7 +++ 1 file changed, 7 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Revise fix for bug 32178 (spaces at end of log msg).
commit 511822529ae1710e141bc26199ec5ff1d1abcd16
Author: Nick Mathewson
Date: Wed Oct 28 09:39:21 2020 -0400
Revise fix for bug 32178 (spaces at end of log msg).
The loop in the earlier patch would invoke undefined behavior in two
ways: First, it would check whether it was looking at a space before
it checked whether the pointer was in-range. Second, it would let a
pointer reach a position _before_ the start of a string, which is
not allowed.
I've removed the assertion about empty messages: empty messages can
be their own warning IMO.
I've also added tests for this formatting code, to make sure it
actually works.
---
changes/ticket32178 | 2 +-
src/feature/control/control_events.c | 36 ++--
src/feature/control/control_events.h | 2 ++
src/test/test_controller_events.c| 28
4 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/changes/ticket32178 b/changes/ticket32178
index ae8554d8a0..c13e490cb0 100644
--- a/changes/ticket32178
+++ b/changes/ticket32178
@@ -1,3 +1,3 @@
o Minor bugfixes (logging):
- Remove trailing whitespaces from control event log messages. Fixes bug
- 32178.
+ 32178; bugfix on 0.1.1.1-alpha. Based on a patch by Amadeusz Pawlik.
diff --git a/src/feature/control/control_events.c
b/src/feature/control/control_events.c
index 57cfb0d026..0dd52659ec 100644
--- a/src/feature/control/control_events.c
+++ b/src/feature/control/control_events.c
@@ -1352,6 +1352,27 @@ enable_control_logging(void)
tor_assert(0);
}
+/** Remove newline and carriage-return characters from @a msg, replacing them
+ * with spaces, and discarding any that appear at the end of the message */
+void
+control_logmsg_strip_newlines(char *msg)
+{
+ char *cp;
+ for (cp = msg; *cp; ++cp) {
+if (*cp == '\r' || *cp == '\n') {
+ *cp = ' ';
+}
+ }
+ if (cp == msg)
+return;
+ /* Remove trailing spaces */
+ for (--cp; *cp == ' '; --cp) {
+*cp = '\0';
+if (cp == msg)
+ break;
+ }
+}
+
/** We got a log message: tell any interested control connections. */
void
control_event_logmsg(int severity, log_domain_mask_t domain, const char *msg)
@@ -1380,21 +1401,8 @@ control_event_logmsg(int severity, log_domain_mask_t
domain, const char *msg)
char *b = NULL;
const char *s;
if (strchr(msg, '\n')) {
- char *cp;
b = tor_strdup(msg);
- for (cp = b; *cp; ++cp)
-if (*cp == '\r' || *cp == '\n')
- *cp = ' ';
-
- /* Remove trailing spaces */
- for (--cp; *cp == ' ' && cp >= b; --cp)
-*cp = '\0';
-
- if ( cp == b ){
-++disable_log_messages;
-tor_assert_nonfatal(*b);
---disable_log_messages;
- }
+ control_logmsg_strip_newlines(b);
}
switch (severity) {
case LOG_DEBUG: s = "DEBUG"; break;
diff --git a/src/feature/control/control_events.h
b/src/feature/control/control_events.h
index 6e3cfef4e9..0ac233cc6e 100644
--- a/src/feature/control/control_events.h
+++ b/src/feature/control/control_events.h
@@ -341,6 +341,8 @@ struct control_event_t {
extern const struct control_event_t control_event_table[];
+void control_logmsg_strip_newlines(char *msg);
+
#ifdef TOR_UNIT_TESTS
MOCK_DECL(STATIC void,
send_control_event_string,(uint16_t event, const char *msg));
diff --git a/src/test/test_controller_events.c
b/src/test/test_controller_events.c
index 60dfbd630a..3cd529fa10 100644
--- a/src/test/test_controller_events.c
+++ b/src/test/test_controller_events.c
@@ -436,6 +436,33 @@ test_cntev_signal(void *arg)
UNMOCK(queue_control_event_string);
}
+static void
+test_cntev_log_fmt(void *arg)
+{
+ (void) arg;
+ char *result = NULL;
+#define CHECK(pre, post) \
+ do {\
+result = tor_strdup((pre)); \
+control_logmsg_strip_newlines(result);\
+tt_str_op(result, OP_EQ, (post)); \
+tor_free(result); \
+ } while (0)
+
+ CHECK("There is a ", "There is a");
+ CHECK("hello", "hello");
+ CHECK("", "");
+ CHECK("Putspaces at the end ", "Putspaces at the end");
+ CHECK(" ", "");
+ CHECK("\n\n\n", "");
+ CHECK("Testing\r\n", "Testing");
+ CHECK("T e s t\ni n g\n", "T e s t i n g");
+
+ done:
+ tor_free(result);
+#undef CHECK
+}
+
static void
setup_orconn_state(orconn_state_msg_t *msg, uint64_t gid, uint64_t chan,
int proxy_type)
@@ -718,6 +745,7 @@ struct testcase_t controller_event_tests[] = {
TEST(event_mask, TT_FORK),
TEST(format_stream, TT_FORK),
TEST(signal, TT_FORK),
+ TEST(log_fmt, 0),
T_PUBSUB(dirboot_defer_desc, TT_FORK),
T_PUBSUB(dirboot_defer_orconn, TT_FORK),
T_PUBSUB(orconn_state, TT_FORK),
___
tor-commits mailing list
tor-commits@lists.torproject.org
[tor-commits] [tor/master] adds change file
commit 4520fbc05e2e3f8288b7e27c45bb2aecbc849f33 Author: Amadeusz Pawlik Date: Sat Oct 26 20:07:04 2019 +0200 adds change file --- changes/ticket32178 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket32178 b/changes/ticket32178 new file mode 100644 index 00..ae8554d8a0 --- /dev/null +++ b/changes/ticket32178 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): +- Remove trailing whitespaces from control event log messages. Fixes bug + 32178. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Removes trailing spaces in control event log
commit ec7a6757ecdff7d6680fca42aba2802bc298e21a
Author: Amadeusz Pawlik
Date: Sat Oct 26 20:06:48 2019 +0200
Removes trailing spaces in control event log
---
src/feature/control/control_events.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/src/feature/control/control_events.c
b/src/feature/control/control_events.c
index 2970745ca0..57cfb0d026 100644
--- a/src/feature/control/control_events.c
+++ b/src/feature/control/control_events.c
@@ -1385,6 +1385,16 @@ control_event_logmsg(int severity, log_domain_mask_t
domain, const char *msg)
for (cp = b; *cp; ++cp)
if (*cp == '\r' || *cp == '\n')
*cp = ' ';
+
+ /* Remove trailing spaces */
+ for (--cp; *cp == ' ' && cp >= b; --cp)
+*cp = '\0';
+
+ if ( cp == b ){
+++disable_log_messages;
+tor_assert_nonfatal(*b);
+--disable_log_messages;
+ }
}
switch (severity) {
case LOG_DEBUG: s = "DEBUG"; break;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/185' into master
commit dd119b277b66c1a7209d4a345fd43878296a532e Merge: 4f5a116618 511822529a Author: George Kadianakis Date: Tue Nov 3 16:06:12 2020 +0200 Merge remote-tracking branch 'tor-gitlab/mr/185' into master changes/ticket32178 | 3 +++ src/feature/control/control_events.c | 26 ++ src/feature/control/control_events.h | 2 ++ src/test/test_controller_events.c| 28 4 files changed, 55 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
commit da607a811ac9958330f76d79adc6df3cf8811cda Author: Translation commit bot Date: Tue Nov 3 12:15:25 2020 + https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml --- zh-rCN/torbrowser_strings.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zh-rCN/torbrowser_strings.xml b/zh-rCN/torbrowser_strings.xml index ffbff77692..ebdda23e54 100644 --- a/zh-rCN/torbrowser_strings.xml +++ b/zh-rCN/torbrowser_strings.xml @@ -2,6 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +%1$s ç± Tor Projectï¼ç¾å½ 501(c)(3) éçå©ç»ç»ï¼æé + åªå 许éç§æµè§æ¨¡å¼ @@ -20,6 +23,7 @@ 设置æ¨çå®å ¨çº§å« ç¦æ¢é¨åè½å½±åæ¨çå®å ¨ï¼å¿åæ§åéç§çç½ç»åè½ã +å½åå®å ¨ç级ï¼%s æå¼å®å ¨è®¾ç½® æ款以ä¿è¯ Tor çæä¹ å®å ¨ã Tor æ¯å 费使ç¨çï¼å 为æåæ¨ä¸æ ·ç人æå©ã @@ -62,10 +66,13 @@ æ åå®å ¨æ§ å°å¯ç¨ Tor æµè§å¨åç½ç«çææåè½ã ä¸çå®å ¨æ§ -ç¦ç¨ç½ç«åè½é常æ¯å±é©çï¼è¿ä¼å¯¼è´ä¸äºç«ä¸è½æ£å¸¸è¿ä½ã +ç¦ç¨ç½ç«åè½é常æ¯å±é©çï¼è¿ä¼å¯¼è´ä¸äºç½ç«ä¸è½æ£å¸¸è¿ä½ã æé«å®å ¨æ§ åªå 许ç½ç«è¯·æ±éæç½é¡µä¸åºæ¬æå¡ãè¿å°ä¼å½±åå¾çï¼åªä½ä¸èæ¬ã + +请æ±è±è¯çæ¬çç½é¡µï¼å¢å¼ºå®å ¨æ§ + å£ç½©é²ç æ¯ï¼Toré²çæ§ã æå»âçæ§âå ¨çæµè¡ç ã ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/fenix-torbrowserstringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
commit cc97b326e08d931781eb7ee1161113f591db9875 Author: Translation commit bot Date: Tue Nov 3 12:15:28 2020 + https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed --- zh-rCN/torbrowser_strings.xml | 28 ++-- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/zh-rCN/torbrowser_strings.xml b/zh-rCN/torbrowser_strings.xml index d84b80e6e0..ebdda23e54 100644 --- a/zh-rCN/torbrowser_strings.xml +++ b/zh-rCN/torbrowser_strings.xml @@ -2,6 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +%1$s ç± Tor Projectï¼ç¾å½ 501(c)(3) éçå©ç»ç»ï¼æé + åªå 许éç§æµè§æ¨¡å¼ @@ -20,12 +23,7 @@ 设置æ¨çå®å ¨çº§å« ç¦æ¢é¨åè½å½±åæ¨çå®å ¨ï¼å¿åæ§åéç§çç½ç»åè½ã -æ åå®å ¨æ§ -å°å¯ç¨ Tor æµè§å¨åç½ç«çææåè½ã -ä¸çå®å ¨æ§ -ç¦ç¨ç½ç«åè½é常æ¯å±é©çï¼è¿ä¼å¯¼è´ä¸äºç«ä¸è½æ£å¸¸è¿ä½ã -æé«å®å ¨æ§ -åªå 许ç½ç«è¯·æ±éæç½é¡µä¸åºæ¬æå¡ãè¿å°ä¼å½±åå¾çï¼åªä½ä¸èæ¬ã +å½åå®å ¨ç级ï¼%s æå¼å®å ¨è®¾ç½® æ款以ä¿è¯ Tor çæä¹ å®å ¨ã Tor æ¯å 费使ç¨çï¼å 为æåæ¨ä¸æ ·ç人æå©ã @@ -59,4 +57,22 @@ å·²è¿æ¥ æ£å¨éå¯ ç½æ¡¥å¯ç¨ï¼%s + + +å®å ¨è®¾ç½® +å®å ¨ç级 + + +æ åå®å ¨æ§ +å°å¯ç¨ Tor æµè§å¨åç½ç«çææåè½ã +ä¸çå®å ¨æ§ +ç¦ç¨ç½ç«åè½é常æ¯å±é©çï¼è¿ä¼å¯¼è´ä¸äºç½ç«ä¸è½æ£å¸¸è¿ä½ã +æé«å®å ¨æ§ +åªå 许ç½ç«è¯·æ±éæç½é¡µä¸åºæ¬æå¡ãè¿å°ä¼å½±åå¾çï¼åªä½ä¸èæ¬ã + + +请æ±è±è¯çæ¬çç½é¡µï¼å¢å¼ºå®å ¨æ§ + +å£ç½©é²ç æ¯ï¼Toré²çæ§ã +æå»âçæ§âå ¨çæµè¡ç ã ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/187' into master
commit 4f5a116618fdb1707905c2fc602a216f7da22e6e Merge: 474369e3fa 3f442987f1 Author: George Kadianakis Date: Tue Nov 3 13:04:09 2020 +0200 Merge remote-tracking branch 'tor-gitlab/mr/187' into master changes/ticket1 | 3 +++ src/app/main/include.am | 2 ++ src/app/main/main.c | 12 +++- src/app/main/risky_options.c | 35 +++ src/app/main/risky_options.h | 17 + 5 files changed, 68 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Log a warning if Tor was built with any "risky" compile-time options
commit 3f442987f194d96a842fd15808e5d40f784cfca4
Author: Nick Mathewson
Date: Wed Oct 28 11:34:30 2020 -0400
Log a warning if Tor was built with any "risky" compile-time options
These options are meant for testing builds only, and are likely to
cause trouble if used in a production environment.
Closes #1.
---
changes/ticket1 | 3 +++
src/app/main/include.am | 2 ++
src/app/main/main.c | 12 +++-
src/app/main/risky_options.c | 35 +++
src/app/main/risky_options.h | 17 +
5 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/changes/ticket1 b/changes/ticket1
new file mode 100644
index 00..279eab76ad
--- /dev/null
+++ b/changes/ticket1
@@ -0,0 +1,3 @@
+ o Minor features (safety):
+- Log a warning at startup if Tor is built with compile-time options that
+ are likely to make it less stable or reliable. Closes ticket 1.
diff --git a/src/app/main/include.am b/src/app/main/include.am
index ea392a8581..576c750377 100644
--- a/src/app/main/include.am
+++ b/src/app/main/include.am
@@ -2,6 +2,7 @@
# ADD_C_FILE: INSERT SOURCES HERE.
LIBTOR_APP_A_SOURCES +=\
src/app/main/main.c \
+ src/app/main/risky_options.c\
src/app/main/shutdown.c \
src/app/main/subsystem_list.c \
src/app/main/subsysmgr.c
@@ -10,6 +11,7 @@ LIBTOR_APP_A_SOURCES += \
noinst_HEADERS += \
src/app/main/main.h \
src/app/main/ntmain.h \
+ src/app/main/risky_options.h\
src/app/main/shutdown.h \
src/app/main/subsysmgr.h
diff --git a/src/app/main/main.c b/src/app/main/main.c
index ff530c0ad0..589d365add 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -16,6 +16,7 @@
#include "app/config/quiet_level.h"
#include "app/main/main.h"
#include "app/main/ntmain.h"
+#include "app/main/risky_options.h"
#include "app/main/shutdown.h"
#include "app/main/subsysmgr.h"
#include "core/mainloop/connection.h"
@@ -539,6 +540,7 @@ tor_init(int argc, char *argv[])
{
char progname[256];
quiet_level_t quiet = QUIET_NONE;
+ bool running_tor = false;
time_of_process_start = time(NULL);
tor_init_connection_lists();
@@ -562,8 +564,10 @@ tor_init(int argc, char *argv[])
whether we log anything at all to stdout. */
parsed_cmdline_t *cmdline;
cmdline = config_parse_commandline(argc, argv, 1);
-if (cmdline)
+if (cmdline) {
quiet = cmdline->quiet_level;
+ running_tor = (cmdline->command == CMD_RUN_TOR);
+}
parsed_cmdline_free(cmdline);
}
@@ -599,6 +603,12 @@ tor_init(int argc, char *argv[])
log_notice(LD_GENERAL, "This version is not a stable Tor release. "
"Expect more bugs than usual.");
+if (strlen(risky_option_list) && running_tor) {
+ log_warn(LD_GENERAL, "This build of Tor has been compiled with one "
+ "or more options that might make it less reliable or secure! "
+ "They are:%s", risky_option_list);
+}
+
tor_compress_log_init_warnings();
}
diff --git a/src/app/main/risky_options.c b/src/app/main/risky_options.c
new file mode 100644
index 00..747dda766b
--- /dev/null
+++ b/src/app/main/risky_options.c
@@ -0,0 +1,35 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2020, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file risky_options.c
+ * \brief List compile-time options that might make Tor less reliable.
+ **/
+
+#include "orconfig.h"
+#include "app/main/risky_options.h"
+
+/** A space-separated list of the compile-time options might make Tor less
+ * reliable or secure. These options mainly exist for testing or debugging.
+ */
+const char risky_option_list[] =
+ ""
+#ifdef DISABLE_ASSERTS_IN_TEST
+ " --disable-asserts-in-test"
+#endif
+#ifdef TOR_UNIT_TESTS
+ " TOR_UNIT_TESTS"
+#endif
+#ifdef ENABLE_RESTART_DEBUGGING
+ " --enable-restart-debugging"
+#endif
+#ifdef ALL_BUGS_ARE_FATAL
+ " --enable-all-bugs-are-fatal"
+#endif
+#ifdef DISABLE_MEMORY_SENTINELS
+ " --disable-memory-sentinels"
+#endif
+ ;
diff --git a/src/app/main/risky_options.h b/src/app/main/risky_options.h
new file mode 100644
index 00..4548ae3efb
--- /dev/null
+++ b/src/app/main/risky_options.h
@@ -0,0 +1,17 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2020, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file risky_options.h
+ * \brief
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit a6540835c71b194192384360dde38b0896d837f7 Author: Translation commit bot Date: Tue Nov 3 10:45:05 2020 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sw/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index 3e2e402f8d..fbc2e1d88b 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-11-03 10:10+\n" +"PO-Revision-Date: 2020-11-03 10:25+\n" "Last-Translator: Zaituni Njovu \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -329,7 +329,7 @@ msgid "" "bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" "see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" "called \"Unallocated\" in %sbridge pool assignment%s files." -msgstr "" +msgstr "DarajaDB inadumisha namba chache za madaraja ambayo haujasambazwa\nkiautomatiki. Badala yake, tunahifadhi madaraja haya kwa mwongozo wa usambazwaji na\nkueka mkono nje ya NGOs na mashirika mengine na kwa moja mmoja itahitaji\nmadaraja. Madaraja ambayo hayajasambazwa juu ya \"Kuhifadhi\" utaratibu hauwezi\nangalia watumiaji kwa muda mrefu. nakilikua \"Kuhifadhi\" kusambaza utaratibu ni\ninaitwa \"haipomahala\" kwenye %szzoezi la daraja la pool%s faili." #: bridgedb/strings.py:137 msgid "None" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit 1beb19022fa6e6e0d081c234a68ed4eea913a9a9 Author: Translation commit bot Date: Tue Nov 3 10:15:07 2020 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sw/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index 1227811c9d..3e2e402f8d 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-11-03 09:40+\n" +"PO-Revision-Date: 2020-11-03 10:10+\n" "Last-Translator: Zaituni Njovu \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -342,7 +342,7 @@ msgid "" "users. Note that on Relay Search, a freshly set up bridge's distribution\n" "mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" "it will then change to the bridge's actual distribution mechanism.\n" -msgstr "" +msgstr "Madaraja ambayo husambaza utaratibu ni \"Tupu\" haujaweza kusambazwa kwa DarajaDB.\nNi uwezo wa uendeshaji wa daraja kwa kusambaza madaraja hayo\nwatumiaji. Nakili kua kwenye upekuaji wa Relay, weka upya kusambaza madaraja\nutaratibu unasema \"Tupu\" kwa juu kwa takribani siku moja. Kua mgonjwa kidogo, na\nitakua alafu badili kwenye madaraja utaratiu halisi wa usambazaji.\n" #: bridgedb/strings.py:148 msgid "Please select options for bridge type:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit 425ee227bb82964a09327d7f80b693834d71025a Author: Translation commit bot Date: Tue Nov 3 09:45:11 2020 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sw/LC_MESSAGES/bridgedb.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index 99a1a98a45..1227811c9d 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-11-03 09:13+\n" +"PO-Revision-Date: 2020-11-03 09:40+\n" "Last-Translator: Zaituni Njovu \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -252,7 +252,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "" +msgstr "Njia nyingine kupata Madaraja ni kwa kutuma barua pepe kwa %s. Ondoa mada ya barua pepe\ntupu na andika \"pata usafiri obfs4\" kwenye muundo wa ujumbe wa barua pepe. Tafadhali nakili\nunatakiwa kutuma barua pepe unayotumia kwenye anwani kutoka moja kati ya barua pepe zifuatazo\nkutoa: %s au %s." #: bridgedb/strings.py:94 msgid "My bridges don't work! I need help!" @@ -314,7 +314,7 @@ msgid "" "Users can request bridges from the \"Email\" distribution mechanism by sending an\n" "email to %sbrid...@torproject.org%s and writing \"get transport obfs4\" in the\n" "email body." -msgstr "" +msgstr "Watumiaji wanaweza kuomba madaraja kutoka kwenye \"Barua pepe\" kusambaza utaratibu kwa kutuma\nbarua pepe kwa %smadar...@torproject.org%s na uandike \"kupata usafiri obfs4\" kwenye\nmwili wa barua pepe." #: bridgedb/strings.py:129 msgid "Reserved" @@ -377,14 +377,14 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr "Kwanza, unatakiwa ku %spakua kivinjari cha Tor%s. mtumiaji wetu wa Kivinjari cha Tor\nmuongozo wa kuelezea vipi unaweza kuongeza madaraja yako kwa Kivinjari cha Tor. Kama ni\ntumia madirisha, Linux, au OS X, %sbonyeza hapa%s kujifunza zaidi. kama ni wewe\nunatumia Android, %sbonyeza hapa%s." #: bridgedb/strings.py:166 msgid "" "Add these bridges to your Tor Browser by opening your browser\n" "preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" "bridge\" field." -msgstr "" +msgstr "Ongeza madaraja haya kwenye Kivinjari chako cha Tor kwakufungua kininjari chako\naula, bonyeza kwenye \"Tor\", na kingine iongezee kwenye \"Kutolewa kwa\ndaraja\" uga." #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit ce9943694cd16b00f62d2b8274f455b01b42b721 Author: Translation commit bot Date: Tue Nov 3 09:15:07 2020 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sw/LC_MESSAGES/bridgedb.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index 066bec4fce..99a1a98a45 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-11-03 08:45+\n" +"PO-Revision-Date: 2020-11-03 09:13+\n" "Last-Translator: Zaituni Njovu \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -288,7 +288,7 @@ msgid "" "the pseudo-mechanism \"None\". The following list briefly explains how these\n" "mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" "mechanisms is." -msgstr "" +msgstr "DarajaDB kutekeleza njia nne za kusambaza daraja: \"HTTPS\", \"Moat\",\n\"Barua pepe\", na \"zimehifadhiwa\". Madaraja ambayo hayajasambwazwa zaidi ya kutumiwa na DarajaDB \nutaratibu bandia \"Hakuna\". Orodha ifuatayokwa ufupi inaelezea kua hizi\nutaratibu wa kazi na yetu %sDaraja la metriki%s taswira maarufu kila moja ya \ntaratibu ni." #: bridgedb/strings.py:115 #, python-format @@ -296,7 +296,7 @@ msgid "" "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" "bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" "solve the subsequent CAPTCHA." -msgstr "" +msgstr "\"HTTPS\" utaratibu wa usambazaji wa mkono nje ya madaraja zaidi ya tovuti hii. Kupata\nmadaraja, nenda kwenye %smadaraja.torproject.org%s,chagua chaguo unalopendelea, na\ntatua CAPTCHA inayofuata." #: bridgedb/strings.py:119 #, python-format @@ -306,7 +306,7 @@ msgid "" "your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" "subsequent CAPTCHA, and Tor Browser will automatically add your new\n" "bridges." -msgstr "" +msgstr "\"Moat\" utaratibu wa usambazaji ni sehemu ya kvinjari cha Tor, kuruhusu watumiaji ku\nkuomba madaraja kutoka ndani kwenye mipangilio ya Kivinjari cha Tor. Kupata madaraja,\nnenda kwenye Kivinjari cha Tor yako %smipangilio ya Tor%s, bofya kuwache \"ombi la daraja jipya\", tatua\nCAPTCHA inayofuata, na Kivinjari cha Tor kiatomatiki kitaongeza mpya yako\nmadaraja." #: bridgedb/strings.py:125 #, python-format @@ -318,7 +318,7 @@ msgstr "" #: bridgedb/strings.py:129 msgid "Reserved" -msgstr "Imepokewa" +msgstr "Zimehifadhiwa" #: bridgedb/strings.py:130 #, python-format @@ -396,4 +396,4 @@ msgstr "(Maombi ya madaraja ya IPv6.)" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)" -msgstr "(Ombi la obfs4 halijafikia madaraja.) " +msgstr "(Ombi la obfs4 halijulikani kwa madaraja.) " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit e2ac25fcde5c0c21970a6e9ce20e30c8941bd4c6 Author: Translation commit bot Date: Tue Nov 3 08:45:06 2020 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sw/LC_MESSAGES/bridgedb.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index 0788c4ef0d..066bec4fce 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-10-20 12:33+\n" +"PO-Revision-Date: 2020-11-03 08:45+\n" "Last-Translator: Zaituni Njovu \n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -318,7 +318,7 @@ msgstr "" #: bridgedb/strings.py:129 msgid "Reserved" -msgstr "" +msgstr "Imepokewa" #: bridgedb/strings.py:130 #, python-format @@ -388,7 +388,7 @@ msgstr "" #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)" -msgstr "" +msgstr "(Ombi halijulikani kwa madaraja ya Tor.)" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)" @@ -396,4 +396,4 @@ msgstr "(Maombi ya madaraja ya IPv6.)" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)" -msgstr "" +msgstr "(Ombi la obfs4 halijafikia madaraja.) " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
