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

[torspec/master] Prop 311: Avoid depending on exact extend details
by teor＠torproject.org 05 Feb '20

05 Feb '20

commit 6eee2ca426bb45faf3b53b481dea956aaecc7dbf Author: teor <teor(a)torproject.org> Date: Thu Jan 30 08:29:51 2020 +1000 Prop 311: Avoid depending on exact extend details We don't want to depend on extends preferring IPv4 or IPv6, or the exact extend implementation, if we don't have to. Part of 24404. --- proposals/311-relay-ipv6-reachability.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/proposals/311-relay-ipv6-reachability.txt b/proposals/311-relay-ipv6-reachability.txt index d2f6b70..ace1704 100644 --- a/proposals/311-relay-ipv6-reachability.txt +++ b/proposals/311-relay-ipv6-reachability.txt @@ -213,6 +213,14 @@ Ticket: #24404 way, and lets us migrate from the current behavior to the 3.3.1 behavior down the road. + However, it might not be necessary: clients should not care if their + extends are over IPv4 or IPv6, they just want to get to an exit safely. + (And clients should not depend on using IPv4 or IPv6, because relays may + use an existing authenticated connection to extend.) The only use case + where extends might want to prefer IPv4 or IPv6 is relay reachability + tests. But we want our reachability test design to succeed, without + depending on the specific extend implementation. + 3.4. Rejected Extend Designs Some designs may never be suitable for the Tor network.

1 0

[torspec/master] Prop 311: Reformat references
by teor＠torproject.org 05 Feb '20

05 Feb '20

commit cdc5a152aa57ea798486453e658f94c7e1522231 Author: teor <teor(a)torproject.org> Date: Mon Feb 3 21:10:22 2020 +1000 Prop 311: Reformat references Part of 24404. --- proposals/311-relay-ipv6-reachability.txt | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/proposals/311-relay-ipv6-reachability.txt b/proposals/311-relay-ipv6-reachability.txt index ace1704..0adf711 100644 --- a/proposals/311-relay-ipv6-reachability.txt +++ b/proposals/311-relay-ipv6-reachability.txt @@ -722,14 +722,24 @@ Ticket: #24404 References: -[Onion Service Protocol]: In particular, Version 3 of the Onion Service Protocol supports IPv6: https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt +[Onion Service Protocol]: + In particular, Version 3 of the Onion Service Protocol supports IPv6: + https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt -[Proposal 306: Client Auto IPv6 Connections]: One possible design for automatic client IPv4 and IPv6 connections is at https://gitweb.torproject.org/torspec.git/tree/proposals/306-ipv6-happy-eye… (TODO: modify to include bridge changes with client changes) +[Proposal 306: Client Auto IPv6 Connections]: + One possible design for automatic client IPv4 and IPv6 connections is at: + https://gitweb.torproject.org/torspec.git/tree/proposals/306-ipv6-happy-eye… + (TODO: modify to include bridge changes with client changes) -[Proposal 312: Relay Auto IPv6 Address]: https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv… +[Proposal 312: Relay Auto IPv6 Address]: + https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv… -[Proposal 313: Relay IPv6 Statistics]: https://gitweb.torproject.org/torspec.git/tree/proposals/313-relay-ipv6-sta… (TODO) +[Proposal 313: Relay IPv6 Statistics]: + https://gitweb.torproject.org/torspec.git/tree/proposals/313-relay-ipv6-sta… + (TODO) -[Relay Search] https://metrics.torproject.org/rs.html +[Relay Search]: + https://metrics.torproject.org/rs.html -[Tor Specification]: https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt +[Tor Specification]: + https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt

1 0

[torspec/master] Prop 311: Allow for auto-configured IPv6 ORPorts
by teor＠torproject.org 05 Feb '20

05 Feb '20

commit 5e79a7dd21b07c3aacd2d37611c518d767c479a0 Author: teor <teor(a)torproject.org> Date: Mon Feb 3 21:26:51 2020 +1000 Prop 311: Allow for auto-configured IPv6 ORPorts Part of 24404. --- proposals/311-relay-ipv6-reachability.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/311-relay-ipv6-reachability.txt b/proposals/311-relay-ipv6-reachability.txt index c292c8a..e83bf64 100644 --- a/proposals/311-relay-ipv6-reachability.txt +++ b/proposals/311-relay-ipv6-reachability.txt @@ -112,7 +112,7 @@ Ticket: #24404 3.2.1. Making IPv6 ORPort Extend Connections Relays may make a new connection over IPv6 when: - * they are configured with an IPv6 ORPort, + * they have an IPv6 ORPort, * there is no existing authenticated connection to the requested relay, and * the extend cell contains an IPv6 ORPort.

1 0

[torspec/master] Prop 311: Rewrite and re-order tor-spec changes
by teor＠torproject.org 05 Feb '20

05 Feb '20

commit f7fb789de4b6198dd7d87aecbd443d0542c08452 Author: teor <teor(a)torproject.org> Date: Mon Feb 3 21:20:15 2020 +1000 Prop 311: Rewrite and re-order tor-spec changes We want to allow relays to upgrade to trying both addresses in an EXTEND2 cell, without requiring a new protocol version. The spec documents the planned "choose at random" behaviour, but allows relays to try both IPv4 and IPv6 in future. Part of 24404. --- proposals/311-relay-ipv6-reachability.txt | 39 ++++++++++++++++++------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/proposals/311-relay-ipv6-reachability.txt b/proposals/311-relay-ipv6-reachability.txt index 0adf711..c292c8a 100644 --- a/proposals/311-relay-ipv6-reachability.txt +++ b/proposals/311-relay-ipv6-reachability.txt @@ -603,7 +603,7 @@ Ticket: #24404 We reserve Tor subprotocol "Relay=3" for tor versions where: * relays may perform IPv6 extends, and * bridges might not perform IPv6 extends, - if configured with an IPv6 ORPort, as described in this proposal. + as described in this proposal. 5.1. Tor Specification Changes @@ -630,18 +630,10 @@ Ticket: #24404 Bridges might not extend over IPv6, because they try to imitate client behaviour. - Relays without an IPv6 ORPort, and tor instances running in other - roles, may: - * advertise support for "Relay=3", and - * react to consensuses recommending or requiring support for - "Relay=3". - But their other behaviour is similar to tor versions supporting - "Relay=2". - A successful IPv6 extend requires: - * Relay subprotocol version 3 (or later) and an IPv6 ORPort on the - extending relay, - * an IPv6 ORPort in the EXTEND2 cell, and + * Relay subprotocol version 3 (or later) on the extending relay, + * an IPv6 ORPort on the extending relay, + * an IPv6 ORPort for the accepting relay in the EXTEND2 cell, and * an IPv6 ORPort on the accepting relay. (Because different tor instances can have different views of the network, these checks should be done when the path is selected. @@ -650,12 +642,27 @@ Ticket: #24404 When relays receive an EXTEND2 cell containing both an IPv4 and an IPv6 ORPort, and there is no existing authenticated connection with - the target relay, the extending relay chooses between IPv4 and IPv6 - at random. (TODO: check final behaviour after code is merged.) + the target relay, the extending relay may choose between IPv4 and + IPv6 at random. The extending relay might not try the other address, + if the first connection fails. + (TODO: check final behaviour after code is merged.) + + As is the case with other subprotocol versions, tor advertises, + recommends, or requires support for this protocol version, regardless + of its current configuration. + + In particular: + * relays without an IPv6 ORPort, and + * tor instances that are not relays, + have the following behaviour, regardless of their configuration: + * advertise support for "Relay=3" in their descriptor + (if they are a relay, bridge, or directory authority), and + * react to consensuses recommending or requiring support for + "Relay=3". This subprotocol version is described in proposal 311, and - implemented in Tor 0.4.4.1-alpha. (TODO: check version after code is - merged). + implemented in Tor 0.4.4.1-alpha. + (TODO: check version after code is merged). 6. Test Plan

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 05 Feb '20

05 Feb '20

commit f6e4cfdd060e86d7630dcbd2a7bdcc4c8c51df25 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 5 11:15:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- es/LC_MESSAGES/bridgedb.po | 60 ++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 5bfd540371..67acf844af 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -1,5 +1,5 @@ # Translations template for bridgedb. -# Copyright (C) 2019 'The Tor Project, Inc.' +# Copyright (C) 2020 'The Tor Project, Inc.' # This file is distributed under the same license as the bridgedb project. # # Translators: @@ -9,7 +9,7 @@ # BL <tresemes3(a)gmail.com>, 2014 # Edward Navarro, 2015 # Emma Peel, 2017-2019 -# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016,2019 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016,2019-2020 # Ignacio Rodríguez <inactive+i5o(a)transifex.com>, 2015 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 # Noel Torres <envite(a)rolamasao.org>, 2013 @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-22 07:44+0000\n" -"Last-Translator: Emma Peel\n" +"POT-Creation-Date: 2020-02-04 10:59-0800\n" +"PO-Revision-Date: 2020-02-05 11:02+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -299,62 +299,64 @@ msgstr "Los %s puentes %s son repetidores Tor que te ayudan a eludir la censura. msgid "I need an alternative way of getting bridges!" msgstr "¡Necesito un modo alternativo de obtención de puentes de red!" -#: bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "get transport obfs4". +#: bridgedb/strings.py:109 #, python-format msgid "" -"Another way to get bridges is to send an email to %s. Please note that you must\n" -"send the email using an address from one of the following email providers:\n" -"%s or %s." -msgstr "Otra forma de obtener puentes es enviar un correo a %s. Ten en cuenta que el correo electrónico debe enviarse usando una dirección de uno de los siguientes proveedores\nde correo electrónico:\n%s o %s" +"Another way to get bridges is to send an email to %s. Leave the email subject\n" +"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 "" -#: bridgedb/strings.py:115 +#: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!" msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and #. "Support Portal", respectively. -#: bridgedb/strings.py:119 +#: bridgedb/strings.py:121 #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "Si tu Tor Browser no puede conectar, lee el %s y nuestro %s." -#: bridgedb/strings.py:123 +#: bridgedb/strings.py:125 msgid "Here are your bridge lines:" msgstr "Estas son tus líneas de puente de red:" -#: bridgedb/strings.py:124 +#: bridgedb/strings.py:126 msgid "Get Bridges!" msgstr "¡Obtener puentes!" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:130 msgid "Please select options for bridge type:" msgstr "Por favor, selecciona opciones para el tipo de puente:" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:131 msgid "Do you need IPv6 addresses?" msgstr "¿Necesitas direcciones IPv6?" -#: bridgedb/strings.py:130 +#: bridgedb/strings.py:132 #, python-format msgid "Do you need a %s?" msgstr "¿Necesitas un %s?" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:136 msgid "Your browser is not displaying images properly." msgstr "Tu navegador no está mostrando las imágenes correctamente." -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:137 msgid "Enter the characters from the image above..." msgstr "Introduce los caracteres de la imagen de arriba..." -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:141 msgid "How to start using your bridges" msgstr "Cómo comenzar a usar los puentes" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:143 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -363,21 +365,21 @@ msgid "" msgstr "Para introducir puentes de red en el Tor Browser, ve a la %s página de descarga del Tor Browser %s y sigue las instrucciones de descarga e inicio del Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:148 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Cuando aparezca el cuadro 'Configuración de red Tor', haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:150 +#: bridgedb/strings.py:152 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "¿Tu proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:154 +#: bridgedb/strings.py:156 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -385,28 +387,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Selecciona 'Sí' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las líneas de puentes en el recuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo! Si hay algún problema, prueba en 'Ayuda' en el asistente de 'Configuración de red Tor' para asistencia adicional." -#: bridgedb/strings.py:162 +#: bridgedb/strings.py:164 msgid "Displays this message." msgstr "Muestra este mensaje." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:166 +#: bridgedb/strings.py:168 msgid "Request vanilla bridges." msgstr "Solicitar puentes estándar." -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:169 msgid "Request IPv6 bridges." msgstr "Solicitar puente de red IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:169 +#: bridgedb/strings.py:171 msgid "Request a Pluggable Transport by TYPE." msgstr "Solicitar un Pluggable Transport por TYPE ." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:174 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB."

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 05 Feb '20

05 Feb '20

commit ca5b17bc3fc3bf22da279e7a598009c8ce54cbbc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 5 11:15:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- es/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index cedc541766..1a92da0864 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ # BL <tresemes3(a)gmail.com>, 2014 # Edward Navarro, 2015 # Emma Peel, 2017-2019 -# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016,2019 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016,2019-2020 # Ignacio Rodríguez <inactive+i5o(a)transifex.com>, 2015 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 # Noel Torres <envite(a)rolamasao.org>, 2013 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-05 01:11+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2020-02-05 11:02+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -307,7 +307,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 "Otra forma de conseguir puentes es enviando un correo electrónico a%s. Deja el asunto del \ncorreo vacío y escribe \"get transport obfs4\"en el cuerpo del mensaje del correo. Ten en cuenta\nde que tienes que enviar el correo usando la dirección de uno de los siguientes proveedores\nde correo: %s o %s." #: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!"

1 0

[community/master] Add email address for discussing new GSoC projects
by pili＠torproject.org 05 Feb '20

05 Feb '20

commit 58249a90844f59ce85e50595d883d0a6193ff91c Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Feb 5 10:46:05 2020 +0100 Add email address for discussing new GSoC projects --- content/gsoc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr index a74dc57..e56ab2b 100644 --- a/content/gsoc/contents.lr +++ b/content/gsoc/contents.lr @@ -20,4 +20,4 @@ title: Project Ideas --- body: -You may find some of these projects to be good ideas for Google Summer of Code. We have labelled each idea with which of our core developers would be good mentors. If one or more of these ideas looks promising to you, please contact us to discuss your plans rather than sending blind applications. +You may find some of these projects to be good ideas for Google Summer of Code. We have labelled each idea with which of our core developers would be good mentors. If one or more of these ideas looks promising to you, please [contact us](mailto:gso+c@torproject.org) to discuss your plans rather than sending blind applications.

1 0

[community/master] Fix Mentor display
by pili＠torproject.org 05 Feb '20

05 Feb '20

commit 5eae339ed7a32f881f1ee23f0185ec5572d05655 Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Feb 5 11:59:58 2020 +0100 Fix Mentor display --- content/gsoc/cloudflare-captcha-monitoring/contents.lr | 4 +++- content/gsoc/gettor-distribution/contents.lr | 2 +- content/gsoc/onion-toolbox/contents.lr | 4 +++- content/gsoc/ooni-explorer-advanced-search/contents.lr | 4 +++- content/gsoc/ooni-probe-experiments/contents.lr | 4 +++- content/gsoc/privacy-aware-geo-lookup/contents.lr | 4 +++- content/gsoc/privacy-friendly-web/contents.lr | 3 ++- content/gsoc/salmon-bridge-distribution/contents.lr | 4 +++- content/gsoc/snowflake-android-proxy/contents.lr | 3 ++- content/gsoc/tor-relay-ipv6-support/contents.lr | 4 +++- models/project.ini | 4 ---- templates/macros/projects.html | 6 ++++++ 12 files changed, 32 insertions(+), 14 deletions(-) diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr b/content/gsoc/cloudflare-captcha-monitoring/contents.lr index dbdc7e4..c311934 100644 --- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr +++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr @@ -18,7 +18,9 @@ languages: python javascript --- -mentors: GeKo, arma +mentors: +GeKo +arma --- difficulty: medium --- diff --git a/content/gsoc/gettor-distribution/contents.lr b/content/gsoc/gettor-distribution/contents.lr index b39c92e..797a2ff 100644 --- a/content/gsoc/gettor-distribution/contents.lr +++ b/content/gsoc/gettor-distribution/contents.lr @@ -20,7 +20,7 @@ ansible --- org: Tor --- -mentors: +mentors: cohosh hiro --- diff --git a/content/gsoc/onion-toolbox/contents.lr b/content/gsoc/onion-toolbox/contents.lr index ed8b5e4..bae15c0 100644 --- a/content/gsoc/onion-toolbox/contents.lr +++ b/content/gsoc/onion-toolbox/contents.lr @@ -19,7 +19,9 @@ Python Docker PythonQt5 --- -mentors: hiro, asn +mentors: +hiro +asn --- difficulty: medium --- diff --git a/content/gsoc/ooni-explorer-advanced-search/contents.lr b/content/gsoc/ooni-explorer-advanced-search/contents.lr index 99b9484..b4d883c 100644 --- a/content/gsoc/ooni-explorer-advanced-search/contents.lr +++ b/content/gsoc/ooni-explorer-advanced-search/contents.lr @@ -18,7 +18,9 @@ languages: React --- org: OONI --- -mentors: Federico Ceratto, Arturo Filastò +mentors: +Federico Ceratto +Arturo Filastò --- difficulty: Medium --- diff --git a/content/gsoc/ooni-probe-experiments/contents.lr b/content/gsoc/ooni-probe-experiments/contents.lr index 8f18dcc..c6426ef 100644 --- a/content/gsoc/ooni-probe-experiments/contents.lr +++ b/content/gsoc/ooni-probe-experiments/contents.lr @@ -18,7 +18,9 @@ languages: Golang --- org: OONI --- -mentors: Simone Basso, Arturo Filastò +mentors: +Simone Basso +Arturo Filastò --- difficulty: low-high --- diff --git a/content/gsoc/privacy-aware-geo-lookup/contents.lr b/content/gsoc/privacy-aware-geo-lookup/contents.lr index d0ba616..1a58eb2 100644 --- a/content/gsoc/privacy-aware-geo-lookup/contents.lr +++ b/content/gsoc/privacy-aware-geo-lookup/contents.lr @@ -20,7 +20,9 @@ Java --- org: OONI --- -mentors: Simone Basso, Arturo Filastò +mentors: +Simone Basso +Arturo Filastò --- difficulty: Medium --- diff --git a/content/gsoc/privacy-friendly-web/contents.lr b/content/gsoc/privacy-friendly-web/contents.lr index c56e209..2878195 100644 --- a/content/gsoc/privacy-friendly-web/contents.lr +++ b/content/gsoc/privacy-friendly-web/contents.lr @@ -20,7 +20,8 @@ CSS HTML Python --- -mentors: hiro +mentors: +hiro --- difficulty: medium --- diff --git a/content/gsoc/salmon-bridge-distribution/contents.lr b/content/gsoc/salmon-bridge-distribution/contents.lr index 11855dc..85a5598 100644 --- a/content/gsoc/salmon-bridge-distribution/contents.lr +++ b/content/gsoc/salmon-bridge-distribution/contents.lr @@ -18,7 +18,9 @@ languages: --- org: Tor --- -mentors: +mentors: +cohosh +ahf --- difficulty: --- diff --git a/content/gsoc/snowflake-android-proxy/contents.lr b/content/gsoc/snowflake-android-proxy/contents.lr index 96f802b..1e2dbf9 100644 --- a/content/gsoc/snowflake-android-proxy/contents.lr +++ b/content/gsoc/snowflake-android-proxy/contents.lr @@ -19,7 +19,8 @@ Android --- org: Tor --- -mentors: cohosh +mentors: +cohosh --- difficulty: --- diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr b/content/gsoc/tor-relay-ipv6-support/contents.lr index 4aff974..ea4a9df 100644 --- a/content/gsoc/tor-relay-ipv6-support/contents.lr +++ b/content/gsoc/tor-relay-ipv6-support/contents.lr @@ -17,7 +17,9 @@ key: 10 languages: C --- -mentors: teor, ahf, dgoulet, catalyst +mentors: +teor +ahf --- difficulty: Medium --- diff --git a/models/project.ini b/models/project.ini index 09ba867..6d5f780 100644 --- a/models/project.ini +++ b/models/project.ini @@ -34,10 +34,6 @@ type = strings label = Languages type = strings -[fields.mentors] -label = Mentors -type = string - [fields.difficulty] label = Difficulty Level type = string diff --git a/templates/macros/projects.html b/templates/macros/projects.html index bbda578..a4e2850 100644 --- a/templates/macros/projects.html +++ b/templates/macros/projects.html @@ -4,9 +4,15 @@ <h5 class="mb-0"> <a href="{{ item.path|url }}">{{ item.title }}</a> </h5> + Languages: {% for lang in item.languages %} <span class="badge badge-primary">{{ lang }}</span> {% endfor %} + <br> + Mentors: + {% for person in item.mentors %} + <span class="badge badge-secondary">{{ person }}</span> + {% endfor %} </div> <div> <div class="card-body">

1 0

[community/master] GSoC mentors should be a list of strings
by pili＠torproject.org 05 Feb '20

05 Feb '20

commit bf9327689fe06bd9554c13da645d0aa70203cac3 Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Feb 5 10:48:10 2020 +0100 GSoC mentors should be a list of strings --- models/project.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/project.ini b/models/project.ini index 17c3260..09ba867 100644 --- a/models/project.ini +++ b/models/project.ini @@ -28,7 +28,7 @@ type = markdown [fields.mentors] label = Mentors -type = string +type = strings [fields.languages] label = Languages

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 05 Feb '20

05 Feb '20

commit d33666b4c57f09d284a29ce15852fd6df63ffc47 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 5 09:45:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- nl/LC_MESSAGES/bridgedb.po | 54 ++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po index 5e8ff9f79a..53ed665dcf 100644 --- a/nl/LC_MESSAGES/bridgedb.po +++ b/nl/LC_MESSAGES/bridgedb.po @@ -1,5 +1,5 @@ # Translations template for bridgedb. -# Copyright (C) 2019 'The Tor Project, Inc.' +# Copyright (C) 2020 'The Tor Project, Inc.' # This file is distributed under the same license as the bridgedb project. # # Translators: @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2020-02-04 13:05+0000\n" +"POT-Creation-Date: 2020-02-04 10:59-0800\n" +"PO-Revision-Date: 2020-02-05 09:16+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -302,62 +302,64 @@ msgstr "" msgid "I need an alternative way of getting bridges!" msgstr "" -#: bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "get transport obfs4". +#: bridgedb/strings.py:109 #, python-format msgid "" -"Another way to get bridges is to send an email to %s. Please note that you must\n" -"send the email using an address from one of the following email providers:\n" -"%s or %s." +"Another way to get bridges is to send an email to %s. Leave the email subject\n" +"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 "" -#: bridgedb/strings.py:115 +#: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and #. "Support Portal", respectively. -#: bridgedb/strings.py:119 +#: bridgedb/strings.py:121 #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "" -#: bridgedb/strings.py:123 +#: bridgedb/strings.py:125 msgid "Here are your bridge lines:" msgstr "" -#: bridgedb/strings.py:124 +#: bridgedb/strings.py:126 msgid "Get Bridges!" msgstr "" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:130 msgid "Please select options for bridge type:" msgstr "" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:131 msgid "Do you need IPv6 addresses?" msgstr "" -#: bridgedb/strings.py:130 +#: bridgedb/strings.py:132 #, python-format msgid "Do you need a %s?" msgstr "" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:136 msgid "Your browser is not displaying images properly." msgstr "" -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:137 msgid "Enter the characters from the image above..." msgstr "" -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:141 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:143 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -366,21 +368,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:148 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:150 +#: bridgedb/strings.py:152 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:154 +#: bridgedb/strings.py:156 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -388,28 +390,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: bridgedb/strings.py:162 +#: bridgedb/strings.py:164 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:166 +#: bridgedb/strings.py:168 msgid "Request vanilla bridges." msgstr "" -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:169 msgid "Request IPv6 bridges." msgstr "IPv6-bridges aanvragen." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:169 +#: bridgedb/strings.py:171 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:174 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr ""

1 0