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

[tor/master] Coding Standards: Document how to find git commits
by nickm＠torproject.org 29 Apr '19

29 Apr '19

commit ac5753d3ca943982290d24899a2c4d406098424a Author: teor <teor(a)torproject.org> Date: Tue Apr 23 10:03:18 2019 +1000 Coding Standards: Document how to find git commits Document how to find git commits and tags for bug fixes in CodingStandards.md. And update some changes file documentation. Closes ticket 30261. --- changes/ticket30261 | 4 ++++ doc/HACKING/CodingStandards.md | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/changes/ticket30261 b/changes/ticket30261 new file mode 100644 index 000000000..e4a2643c8 --- /dev/null +++ b/changes/ticket30261 @@ -0,0 +1,4 @@ + o Documentation: + - Document how to find git commits and tags for bug fixes in + CodingStandards.md. And update some changes file documentation. + Closes ticket 30261. diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 4f229348e..74db2a39a 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -110,12 +110,41 @@ it's a bugfix, mention what bug it fixes and when the bug was introduced. To find out which Git tag the change was introduced in, you can use `git describe --contains <sha1 of commit>`. -If at all possible, try to create this file in the same commit where you are -making the change. Please give it a distinctive name that no other branch will -use for the lifetime of your change. To verify the format of the changes file, -you can use `make check-changes`. This is run automatically as part of -`make check` -- if it fails, we must fix it before we release. These -checks are implemented in `scripts/maint/lintChanges.py`. +If you don't know the commit, you can search the git diffs (-S) for the first +instance of the feature (--reverse). + +For example, for #30224, we wanted to know when the bridge-distribution-request +feature was introduced into Tor: + $ git log -S bridge-distribution-request --reverse + commit ebab521525 + Author: Roger Dingledine <arma(a)torproject.org> + Date: Sun Nov 13 02:39:16 2016 -0500 + + Add new BridgeDistribution config option + + $ git describe --contains ebab521525 + tor-0.3.2.3-alpha~15^2~4 + +If you need to know all the Tor versions that contain a commit, use: + $ git tag --contains 9f2efd02a1 | sort -V + tor-0.2.5.16 + tor-0.2.8.17 + tor-0.2.9.14 + tor-0.2.9.15 + ... + tor-0.3.0.13 + tor-0.3.1.9 + tor-0.3.1.10 + ... + +If at all possible, try to create the changes file in the same commit where +you are making the change. Please give it a distinctive name that no other +branch will use for the lifetime of your change. We usually use "ticketNNNNN" +or "bugNNNNN", where NNNNN is the ticket number. To verify the format of the +changes file, you can use `make check-changes`. This is run automatically as +part of `make check` -- if it fails, we must fix it as soon as possible, so +that our CI passes. These checks are implemented in +`scripts/maint/lintChanges.py`. Changes file style guide: * Changes files begin with " o Header (subheading):". The header

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/972'
by nickm＠torproject.org 29 Apr '19

29 Apr '19

commit 44e6663b8a51187e80a3f94d1185950cf62b4264 Merge: 206d28ff1 ac5753d3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 29 13:36:35 2019 -0400 Merge remote-tracking branch 'tor-github/pr/972' changes/ticket30261 | 4 ++++ doc/HACKING/CodingStandards.md | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-)

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 02155fc53aae4c3d34e4a87e7e382a24c789618a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 17:21:08 2019 +0000 Update translations for support-portal_completed --- contents+es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index fb298275b..04ecb04fa 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2886,7 +2886,7 @@ msgstr "El uso de puentes probablemente solucionará esto." #: https//support.torproject.org/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "##### Common log error #4: Clock skew" -msgstr "<h5>Error de registro común #4: Reloj sesgado</h5>" +msgstr "<h5>Error de registro común #4: Reloj fuera de hora</h5>" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 0f45a6f9a358d074a14985f5b61e25374423e28d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 17:20:58 2019 +0000 Update translations for support-portal --- contents+es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index fb298275b..04ecb04fa 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2886,7 +2886,7 @@ msgstr "El uso de puentes probablemente solucionará esto." #: https//support.torproject.org/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "##### Common log error #4: Clock skew" -msgstr "<h5>Error de registro común #4: Reloj sesgado</h5>" +msgstr "<h5>Error de registro común #4: Reloj fuera de hora</h5>" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description)

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit fffe0573e5cd61bf264dbadabb874cfd5bc63d18 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 17:20:29 2019 +0000 Update translations for tpo-web --- contents+fr.po | 18 +++++++++--------- contents+ru.po | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index d9e502336..3d5dfde1a 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -393,9 +393,9 @@ msgid "" msgstr "" "Tor commença à gagner en popularité parmi les activistes et les utilisateurs" " technophiles intéressés par la protection de la vie privée et des données " -"personnelles. Mais Thor était encore difficile à utiliser pour les personnes" -" moins technophiles, et à partir de 2005, commença le développement d’outils" -" au-delà du simple mandataire Tor." +"personnelles. Mais Tor était encore difficile à utiliser pour les personnes " +"moins technophiles, et à partir de 2005, commença le développement d’outils " +"au-delà du simple mandataire Tor." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -417,8 +417,8 @@ msgid "" " 2010. It not only protected people's identity online but also allowed them " "to access critical resources, social media, and websites which were blocked." msgstr "" -"Le Navigateur Tor ayant facilité l’accès des utilisateurs d’Internet de tous" -" les jours et des activistes à Tor, Tor contribua au [printemps " +"Le Navigateur Tor ayant facilité l’accès à Tor des utilisateurs d’Internet " +"de tous les jours et des activistes Tor contribua au [printemps " "arabe](https://www.theguardian.com/us-news/the-nsa-files) (page en anglais) " "qui commença à la fin de 2010. Non seulement il protégea l’identité des " "personnes sur Internet, mais il leur permit aussi d’accéder à des ressources" @@ -476,10 +476,10 @@ msgid "" "to an uncensored internet, and Tor has become the world's strongest tool for" " privacy and freedom online." msgstr "" -"Nous, chez le Projet Tor, nous battons tous les jours pour un accès non " -"censuré à Internet qui protège la vie privée et les données personnelles, et" -" Tor est devenu l’outil le plus puissant au monde en matière de vie privée " -"et de liberté sur Internet." +"Nous, chez le Projet Tor, nous battons tous les jours pour que tout le monde" +" ait un accès non censuré à Internet qui protège la vie privée et les " +"données personnelles. Tor est devenu l’outil le plus puissant au monde en " +"matière de vie privée et de liberté sur Internet." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) diff --git a/contents+ru.po b/contents+ru.po index 9e1ef4202..fa8837505 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -3,18 +3,18 @@ # Katrin Kutepova <blackkatelv(a)gmail.com>, 2019 # erinm, 2019 # Kalyuzhniy Aleksey, 2019 -# Sergey Smirnov <cj75300(a)gmail.com>, 2019 # Виктор Ерухин <folkraft(a)rambler.ru>, 2019 # Emma Peel, 2019 # Иван Иванов <remove4kebab(a)protonmail.com>, 2019 +# Sergey Smirnov <cj75300(a)gmail.com>, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-23 13:54+CET\n" +"POT-Creation-Date: 2019-04-25 20:12+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Иван Иванов <remove4kebab(a)protonmail.com>, 2019\n" +"Last-Translator: Sergey Smirnov <cj75300(a)gmail.com>, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -659,20 +659,20 @@ msgstr "Скачать Tor Browser для Android." msgid "Protect yourself against tracking, surveillance, and censorship." msgstr "Защитите себя от трекеров, слежки и цензуры." -#: templates/download-android.html:20 templates/download-android.html:22 +#: templates/download-android.html:28 templates/download-android.html:30 msgid "Download .apk" msgstr "Скачать .apk" -#: templates/download-android.html:26 +#: templates/download-android.html:35 msgid "Go to Google Play" msgstr "Перейти в Google Play" -#: templates/download-android.html:30 +#: templates/download-android.html:39 #, python-format msgid "Go to F-droid %s" msgstr "Перейти в F-droid %s" -#: templates/download-android.html:35 +#: templates/download-android.html:44 msgid "Are you a iOS user? We encourage you to try Onion Browser." msgstr "" @@ -812,15 +812,15 @@ msgstr "" msgid "Defend yourself." msgstr "Защитите себя." -#: templates/hero-download.html:42 +#: templates/hero-download.html:45 msgid "Download in another language or platform" msgstr "" -#: templates/hero-download.html:43 +#: templates/hero-download.html:46 msgid "Advanced Install Options" msgstr "Дополнительные опции установки" -#: templates/hero-download.html:47 +#: templates/hero-download.html:50 msgid "Read the latest release announcements" msgstr "" @@ -852,8 +852,8 @@ msgid "" " So will your browsing history." msgstr "" "Tor Browser изолирует каждый загружаемый сайт: трекеры третьих сторон и " -"рекламщики не могут вас отслеживать. По окончании работы автоматически " -"сбрасываются и куки-файлы, и история посещений." +"рекламщики не могут вас отслеживать. История посещений и куки-файлы " +"автоматически сбрасываются по окончании работы." #: templates/home.html:24 msgid "Defend Against Surveillance" @@ -1103,7 +1103,7 @@ msgstr "" msgid "Use your skills to volunteer." msgstr "" -#: templates/macros/downloads.html:47 +#: templates/macros/downloads.html:61 msgid "tor browser manual" msgstr "руководство tor browser"

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit acd85e12cdceb8130199d242e364c36384edbc65 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:50:56 2019 +0000 Update translations for support-portal_completed --- contents+es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+es.po b/contents+es.po index 879cc6e19..fb298275b 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2365,8 +2365,8 @@ msgid "" "Orfox is for web browsing, and Orbot can route other apps on your Android " "phone over the Tor network." msgstr "" -"Orfox es para navegación web, y Orbot permite enrutar otras aplicaciones en " -"tu teléfono Android sobre la red Tor." +"Orfox es para navegación web, y Orbot permite enrutar otras aplicaciones de " +"tu teléfono Android a través la red Tor." #: https//support.torproject.org/tormobile/tormobile-2/ #: (content/tormobile/tormobile-2/contents+en.lrquestion.title) @@ -2667,8 +2667,8 @@ msgid "" "2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with " "directory server" msgstr "" -"2017-10-29 09:23:47.900 [NOTICE] Arranque al 10%: Finaliza el handshake con " -"el servidor de directorios" +"2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"directory server" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit 103d3a5681e3bdaae55eea21432a8c89692df675 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:50:49 2019 +0000 Update translations for support-portal --- contents+es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+es.po b/contents+es.po index 879cc6e19..fb298275b 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2365,8 +2365,8 @@ msgid "" "Orfox is for web browsing, and Orbot can route other apps on your Android " "phone over the Tor network." msgstr "" -"Orfox es para navegación web, y Orbot permite enrutar otras aplicaciones en " -"tu teléfono Android sobre la red Tor." +"Orfox es para navegación web, y Orbot permite enrutar otras aplicaciones de " +"tu teléfono Android a través la red Tor." #: https//support.torproject.org/tormobile/tormobile-2/ #: (content/tormobile/tormobile-2/contents+en.lrquestion.title) @@ -2667,8 +2667,8 @@ msgid "" "2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with " "directory server" msgstr "" -"2017-10-29 09:23:47.900 [NOTICE] Arranque al 10%: Finaliza el handshake con " -"el servidor de directorios" +"2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with " +"directory server" #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description)

1 0

[tpo/master] Fix typo
by hiro＠torproject.org 29 Apr '19

29 Apr '19

commit 6442ac883f3a0f47555193403aa6b67a9d63de42 Author: hiro <hiro(a)torproject.org> Date: Mon Apr 29 18:29:41 2019 +0200 Fix typo --- content/about/history/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index 9dde452..9b7a56e 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -14,7 +14,7 @@ body: The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of "onion routing" began in the mid 1990s. -**Just like Tor users, the developers, researchers, and funders who've made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web.** +**Just like Tor users, the developers, researchers, and founders who've made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web.** In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1995, David Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab (NRL) asked themselves if there was a way to create internet connections that don't reveal who is talking to whom, even to someone monitoring the network. Their answer was to create and deploy the first research designs and prototypes of onion routing.

1 0

[tpo/master] Triggers push
by hiro＠torproject.org 29 Apr '19

29 Apr '19

commit 53782f1fd3e647e1ac2a9f27908e25ccb2b97daa Author: hiro <hiro(a)torproject.org> Date: Mon Apr 29 18:26:33 2019 +0200 Triggers push --- content/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/contents.lr b/content/contents.lr index aafc2b5..46b89ce 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -12,7 +12,7 @@ html: home.html --- body: -######ABOUT US###### +###### ABOUT US ###### We believe everyone should be able to explore the internet with privacy. We are the Tor Project, a 501(c)3 US nonprofit.

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 29 Apr '19

29 Apr '19

commit c70cd7448e058ce16066255de3b5e9c568e2f910 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:21:04 2019 +0000 Update translations for support-portal_completed --- contents+ka.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index b755b9eaf..6868a95c2 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1877,6 +1877,11 @@ msgid "" "working to add more. Want to help us translate? [See here](https://tb-" "manual.torproject.org/becoming-tor-translator/)" msgstr "" +"ჩვენ გვსურს, ყველას შეეძლოს Tor-ბრაუზერის საკუთარ ენაზე გამოყენება. Tor-" +"ბრაუზერი ახლა უკვე [ხელმისაწვდომია 25 სხვადასხვა " +"ენაზე](https://www.torproject.org/download/languages/) და ვმუშაობთ კიდევ " +"მეტის დასამატებლად. გსურთ დაგვეხმაროთ თარგმნაში? [იხილეთ ვრცლად](https://tb-" +"manual.torproject.org/becoming-tor-translator/)" #: https//support.torproject.org/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -6160,7 +6165,7 @@ msgstr "დაკავშირება" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "Donate" -msgstr "გაიღეთ შემოწირულობა" +msgstr "შემოწირულობა" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description)

1 0