tor-commits October 2019

tor-commits@lists.torproject.org

22 participants
4141 discussions

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 16 Oct '19

16 Oct '19

commit 71012a2587aa6adeb3028430f1b18d4d5b571b09 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 16 15:17:00 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+fr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po index ff6b069ad..357bc8872 100644 --- a/code_of_conduct+fr.po +++ b/code_of_conduct+fr.po @@ -179,7 +179,7 @@ msgid "" " questions or concerns. Public key:\n" " https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" msgstr "" -"ET : empressez-vous d’envoyer un courriel à tor-community-counci(a)lists.torproject.org avec vos questions ou préoccupations. Clé publique :\n" +"ET empressez-vous d’envoyer un courriel à tor-community-counci(a)lists.torproject.org avec vos questions ou préoccupations. Clé publique :\n" "https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact (page en anglais)\n" #. type: Plain text @@ -261,8 +261,8 @@ msgstr "" msgid "" "The following behaviors are expected and requested of all community members:" msgstr "" -"Les comportements suivants sont attendus et requis de tous les membres de la" -" communauté:" +"Les comportements suivants sont demandés à tous les membres de la communauté" +" :" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:83 @@ -277,21 +277,20 @@ msgstr "" #: ../code_of_conduct.txt:85 msgid "Exercise consideration and respect in your speech and actions." msgstr "" -"Exercez la considération et le respect dans votre discours et vos actions." +"Faire preuve de considération et de respect dans vos paroles et actions." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:87 msgid "Attempt collaboration and dialog before engaging in conflict." -msgstr "" -"Essayez de collaborer et de dialoguer avant de vous engager dans un conflit." +msgstr "Tenter de collaborer et de dialoguer avant de susciter un conflit." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:89 msgid "" "Refrain from demeaning, discriminatory, or harassing behavior and speech." msgstr "" -"S’abstenir de tout comportement et discours humiliants, discriminatoires ou " -"harcelants." +"S’abstenir de toutes paroles et comportements dévalorisants, " +"discriminatoires ou harcelants." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:92 @@ -299,8 +298,8 @@ msgid "" "Be mindful of your surroundings and of your fellow participants. Alert " "community leaders if you notice:" msgstr "" -"Soyez conscient de votre environnement et de celui de vos collègues. Alertez" -" les leaders de la communauté si vous remarquez:" +"Être attentif à votre environnement et autres participants. Alerter les " +"responsables de la communauté si vous remarquez :" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:94 @@ -315,7 +314,8 @@ msgstr "quelqu’un en détresse" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:98 msgid "violations of this code of conduct, even if they seem minor" -msgstr "violations de ce code de conduite, même si elles semblent mineures" +msgstr "" +"des contraventions à ce code de conduite, même si elles semblent mineures" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:101 @@ -323,14 +323,14 @@ msgid "" "Remember that community event venues may be shared with members of the " "public. Please be respectful to everyone using these locations." msgstr "" -"Rappelez-vous que les lieux d’événement communautaires peuvent être partagés" -" avec les membres du public. S’il vous plaît soyez respectueux envers tous " -"ceux qui utilisent ces emplacements." +"Se rappeler que les lieux d’événements communautaires peuvent être partagés " +"avec des membres du public. Veuillez faire preuve de respect à l’égard de " +"quiconque utilise ces lieux." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:103 msgid "Respect the privacy of your fellow community members." -msgstr "Respectez la vie privée des membres de votre communauté." +msgstr "Respecter la vie privée des autres membres de la communauté." #. type: Plain text #: ../code_of_conduct.txt:106 @@ -345,7 +345,7 @@ msgstr "" #. type: Plain text #: ../code_of_conduct.txt:109 msgid "The following behaviors are unacceptable within our community:" -msgstr "Les comportements suivants sont inacceptables dans notre communauté:" +msgstr "Les comportements suivants sont inacceptables dans notre communauté :" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:114

1 0

[community/master] add item to nav
by antonela＠torproject.org 16 Oct '19

16 Oct '19

commit 025ee4439a7dfc6b9c39c0b136c91d870e9c0f08 Author: Antonela <hola(a)antonela.me> Date: Wed Oct 16 12:12:52 2019 -0300 add item to nav --- databags/pagenav+en.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/databags/pagenav+en.ini b/databags/pagenav+en.ini index 7d03cec..57c87f6 100644 --- a/databags/pagenav+en.ini +++ b/databags/pagenav+en.ini @@ -10,6 +10,10 @@ label = Localization path = outreach label = Outreach +[user-research] +path = user-research +label = User Research + [relay-operations] path = relay-operations label = Relay Operations

1 0

[tor/master] voting_schedule: fix doxygen comments to use /**
by nickm＠torproject.org 16 Oct '19

16 Oct '19

commit ce0739314bc581589df3e68d79755e8fbe3e5e6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 16 11:08:34 2019 -0400 voting_schedule: fix doxygen comments to use /** Previously some of the comments here used /*. --- src/feature/dircommon/voting_schedule.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/feature/dircommon/voting_schedule.h b/src/feature/dircommon/voting_schedule.h index d78c7ee2d..fd677fc83 100644 --- a/src/feature/dircommon/voting_schedule.h +++ b/src/feature/dircommon/voting_schedule.h @@ -26,15 +26,15 @@ typedef struct { /** When do we publish the consensus? */ time_t interval_starts; - /* True iff we have generated and distributed our vote. */ + /** True iff we have generated and distributed our vote. */ int have_voted; - /* True iff we've requested missing votes. */ + /** True iff we've requested missing votes. */ int have_fetched_missing_votes; - /* True iff we have built a consensus and sent the signatures around. */ + /** True iff we have built a consensus and sent the signatures around. */ int have_built_consensus; - /* True iff we've fetched missing signatures. */ + /** True iff we've fetched missing signatures. */ int have_fetched_missing_signatures; - /* True iff we have published our consensus. */ + /** True iff we have published our consensus. */ int have_published_consensus; /* True iff this voting schedule was set on demand meaning not through the @@ -62,4 +62,3 @@ time_t voting_schedule_get_start_of_next_interval(time_t now, time_t voting_schedule_get_next_valid_after_time(void); #endif /* !defined(TOR_VOTING_SCHEDULE_H) */ -

1 0

[tor/master] channel.h: fix various doxygen warnings
by nickm＠torproject.org 16 Oct '19

16 Oct '19

commit a54c98007a3233fa1abd33e920e724fadb8d1aeb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 16 11:11:43 2019 -0400 channel.h: fix various doxygen warnings There were a bunch of items where the doxygen comments were formatted incorrectly (with /* instead of /**) --- src/core/or/channel.h | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 97aa00033..3533e6176 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -48,7 +48,7 @@ typedef enum { /* channel states for channel_t */ typedef enum { - /* + /** * Closed state - channel is inactive * * Permitted transitions from: @@ -57,7 +57,7 @@ typedef enum { * - CHANNEL_STATE_OPENING */ CHANNEL_STATE_CLOSED = 0, - /* + /** * Opening state - channel is trying to connect * * Permitted transitions from: @@ -68,7 +68,7 @@ typedef enum { * - CHANNEL_STATE_OPEN */ CHANNEL_STATE_OPENING, - /* + /** * Open state - channel is active and ready for use * * Permitted transitions from: @@ -80,7 +80,7 @@ typedef enum { * - CHANNEL_STATE_MAINT */ CHANNEL_STATE_OPEN, - /* + /** * Maintenance state - channel is temporarily offline for subclass specific * maintenance activities such as TLS renegotiation. * @@ -92,7 +92,7 @@ typedef enum { * - CHANNEL_STATE_OPEN */ CHANNEL_STATE_MAINT, - /* + /** * Closing state - channel is shutting down * * Permitted transitions from: @@ -103,7 +103,7 @@ typedef enum { * - CHANNEL_STATE_ERROR */ CHANNEL_STATE_CLOSING, - /* + /** * Error state - channel has experienced a permanent error * * Permitted transitions from: @@ -115,7 +115,7 @@ typedef enum { * - None */ CHANNEL_STATE_ERROR, - /* + /** * Placeholder for maximum state value */ CHANNEL_STATE_LAST @@ -124,7 +124,7 @@ typedef enum { /* channel listener states for channel_listener_t */ typedef enum { - /* + /** * Closed state - channel listener is inactive * * Permitted transitions from: @@ -133,7 +133,7 @@ typedef enum { * - CHANNEL_LISTENER_STATE_LISTENING */ CHANNEL_LISTENER_STATE_CLOSED = 0, - /* + /** * Listening state - channel listener is listening for incoming * connections * @@ -144,7 +144,7 @@ typedef enum { * - CHANNEL_LISTENER_STATE_ERROR */ CHANNEL_LISTENER_STATE_LISTENING, - /* + /** * Closing state - channel listener is shutting down * * Permitted transitions from: @@ -154,7 +154,7 @@ typedef enum { * - CHANNEL_LISTENER_STATE_ERROR */ CHANNEL_LISTENER_STATE_CLOSING, - /* + /** * Error state - channel listener has experienced a permanent error * * Permitted transitions from: @@ -164,7 +164,7 @@ typedef enum { * - None */ CHANNEL_LISTENER_STATE_ERROR, - /* + /** * Placeholder for maximum state value */ CHANNEL_LISTENER_STATE_LAST @@ -267,21 +267,21 @@ struct channel_s { /** State variable for use by the scheduler */ enum { - /* + /** * The channel is not open, or it has a full output buffer but no queued * cells. */ SCHED_CHAN_IDLE = 0, - /* + /** * The channel has space on its output buffer to write, but no queued * cells. */ SCHED_CHAN_WAITING_FOR_CELLS, - /* + /** * The scheduler has queued cells but no output buffer space to write. */ SCHED_CHAN_WAITING_TO_WRITE, - /* + /** * The scheduler has both queued cells and output buffer space, and is * eligible for the scheduler loop. */ @@ -444,9 +444,9 @@ struct channel_s { ratelim_t last_warned_circ_ids_exhausted; /** Channel timestamps for cell channels */ - time_t timestamp_client; /* Client used this, according to relay.c */ - time_t timestamp_recv; /* Cell received from lower layer */ - time_t timestamp_xmit; /* Cell sent to lower layer */ + time_t timestamp_client; /*(< Client used this, according to relay.c */ + time_t timestamp_recv; /**< Cell received from lower layer */ + time_t timestamp_xmit; /**< Cell sent to lower layer */ /** Timestamp for run_connection_housekeeping(). We update this once a * second when we run housekeeping and find a circuit on this channel, and @@ -458,16 +458,17 @@ struct channel_s { * distinct namespace. */ uint64_t dirreq_id; - /** Channel counters for cell channels */ + /** Channel counters for cells and bytes we have received. */ uint64_t n_cells_recved, n_bytes_recved; + /** Channel counters for cells and bytes we have sent. */ uint64_t n_cells_xmitted, n_bytes_xmitted; }; struct channel_listener_s { - /* Current channel listener state */ + /** Current channel listener state */ channel_listener_state_t state; - /* Globally unique ID number for a channel over the lifetime of a Tor + /** Globally unique ID number for a channel over the lifetime of a Tor * process. */ uint64_t global_identifier;

1 0

[community/master] update user research content
by antonela＠torproject.org 16 Oct '19

16 Oct '19

commit ee883fbc4107546c3076c4409d65be2af9b36cff Author: Antonela <hola(a)antonela.me> Date: Wed Oct 16 12:02:59 2019 -0300 update user research content --- templates/user-research.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/templates/user-research.html b/templates/user-research.html index c2c323a..e12fa62 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -13,8 +13,10 @@ <div class="card h-100"> <div class="card-body"> <div class="card-body"> - <h4 class="card-title text-primary">{{ child.title }}</h4> - <p class="card-text">{{ child.subtitle }}</p> + <h4 class="card-title text-primary"> + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + </h4> + <p class="card-text">{{ _(child.subtitle) }}</p> </div> </div> </div> @@ -22,11 +24,11 @@ {% endfor %} </div> <div class="row py-5 text-center mx-auto"> - <h2 class="display-4 text-primary text-center mx-auto">{{ _('Be a user testing coordinator') }}</h2> + <h2 class="display-4 text-primary text-center mx-auto">{{ _('Become a Community User Researcher') }}</h2> <p class="text-center"> - {{ _('Are you a UX researcher interested in running Tor user tests? Have new ideas, suggestions, or studies that can help improve Tor applications? Help us by coordinating user testing, and we\'ll send you a Tor t-shirt.') }}</p> - <h3 class="text-primary text-center mx-auto"><u>{{ _('User research list') }} - <i class="fas fa-arrow-right"></i></u> - </h3> + {{ _('Are you a design researcher, user researcher, student, or someone interested in learning more about Tor users? Do you have new ideas, suggestions, or research that can help improve Tor applications? Help us by coordinating user research with your local community, and learn more about best practices for working with users at-risk.') }}</p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/ux"> + {{ _('UX team mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> </div> </div>

1 0

[community/master] fix title case
by antonela＠torproject.org 16 Oct '19

16 Oct '19

commit 0e1f7b8c4a985e1b68547b00ee1228193257313e Author: Antonela <hola(a)antonela.me> Date: Wed Oct 16 11:59:21 2019 -0300 fix title case --- content/user-research/become-tester/contents.lr | 2 +- content/user-research/open/contents.lr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 248d815..3602131 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,7 +8,7 @@ image: eye --- _template: layout.html --- -title: Become a tester +title: Become a Tester --- subtitle: We regularly release Tor Browser Alpha versions to allow users to test software improvements and new ideas. --- diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index c0a9198..17cb0f9 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -8,7 +8,7 @@ image: eye --- _template: layout.html --- -title: Open user research +title: Open User Research --- subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. ---

1 0

[community/master] match layout with other sections
by antonela＠torproject.org 16 Oct '19

16 Oct '19

commit 24a118e67fa93d79c6eec22aaced4ac1bc60e0c7 Author: Antonela <hola(a)antonela.me> Date: Wed Oct 16 11:58:25 2019 -0300 match layout with other sections --- templates/user-research.html | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/templates/user-research.html b/templates/user-research.html index 3c3ac7b..c2c323a 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -7,17 +7,15 @@ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> - <h2 class="text-primary"><u>{{ _('Want to know more? Take a look at our process') }} - <i class="fas fa-arrow-right"></i></u> - </h2> - <div class="row py-5"> + <div class="row"> {% for child in this.children|sort(attribute='key') %} - <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> - <div class="card h-100 border-0"> + <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> + <div class="card h-100"> <div class="card-body"> - <span class="text-primary h3"><i class="far fa-{{ child.image }}"></i></span> - <h4 class="card-title text-primary my-3">{{ child.title }}</h4> - <p class="card-text">{{ child.subtitle }}</p> + <div class="card-body"> + <h4 class="card-title text-primary">{{ child.title }}</h4> + <p class="card-text">{{ child.subtitle }}</p> + </div> </div> </div> </div>

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 16 Oct '19

16 Oct '19

commit 07b3b7b9e258b3551faabf1a784dd0ca136e7c7e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 16 14:52:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ja/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 61fa5e387..4e74a67c2 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -63,8 +63,8 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Tor の設定"> +<!ENTITY torPreferences.torSettingsDescription "Tor Browser は通信トラフィックを Tor ネットワークを経由させて送信します。Tor ネットワークは世界中の何千ものボランティアによって運用されています。" > <!ENTITY torPreferences.learnMore "詳細情報"> <!ENTITY torPreferences.bridges "ブリッジ"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">

1 0

[community/master] sort layout items
by antonela＠torproject.org 16 Oct '19

16 Oct '19

commit 2f8c9270e48ea0dffa2ff7876c9b30bf1782e6e6 Author: Antonela <hola(a)antonela.me> Date: Wed Oct 16 11:49:39 2019 -0300 sort layout items --- content/localization/contents.lr | 4 ++-- content/onion-services/contents.lr | 2 +- content/relay-operations/contents.lr | 2 +- content/user-research/contents.lr | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/localization/contents.lr b/content/localization/contents.lr index e356bc4..00b6229 100644 --- a/content/localization/contents.lr +++ b/content/localization/contents.lr @@ -12,7 +12,7 @@ subtitle: We want Tor to work for everyone in the world, which means our softwar --- cta: Help us translate --- -key: 2 +key: 4 --- html: localization.html --- @@ -22,4 +22,4 @@ body: In order for Tor to work for everyone, it needs to speak everyone's languages. Our volunteer translation team works hard to make this a reality, and we can always use more help. -Our current translation priorities are translating [Tor Browser](https://torpat.ch/locales), Tor Browser documentation, and the [Tor Project website](https://torpat.ch/tpo-locales), but there are many other documents that we could use help translating as well. +Our current translation priorities are translating [Tor Browser](https://torpat.ch/locales), Tor Browser documentation, and the [Tor Project website](https://torpat.ch/tpo-locales), but there are many other documents that we could use help translating as well. diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index 9e51c1c..d9af6b7 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -12,7 +12,7 @@ subtitle: Onion services help you and your users defeat surveillance and censors --- cta: Grow your .onion --- -key: 6 +key: 3 --- html: onion-services.html --- diff --git a/content/relay-operations/contents.lr b/content/relay-operations/contents.lr index 40f0df7..6bf4422 100644 --- a/content/relay-operations/contents.lr +++ b/content/relay-operations/contents.lr @@ -12,7 +12,7 @@ subtitle: Relays are the backbone of the Tor network. Help make Tor stronger and --- cta: Grow the Tor network --- -key: 5 +key: 6 --- html: relay-operations.html --- diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 844d79d..5787f2c 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -12,7 +12,7 @@ subtitle: We conduct user research while also respecting user privacy. --- cta: Learn about Tor users --- -key: 4 +key: 5 --- html: user-research.html ---

1 0

[tor/master] Make doc/doxygen before running doxygen.
by nickm＠torproject.org 16 Oct '19

16 Oct '19

commit 911adb4d2b4e536eb4bd627a3cdba72f6ddf884b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 16 10:31:44 2019 -0400 Make doc/doxygen before running doxygen. This makes out-of-tree doxygen builds work. Closes ticket 32113. --- Makefile.am | 2 +- changes/ticket32113 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f0d960efe..32cb21f38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -238,7 +238,7 @@ dist-rpm: dist-gzip .PHONY: doxygen doxygen: Doxyfile - doxygen + mkdir -p doc/doxygen && doxygen test: all $(top_builddir)/src/test/test diff --git a/changes/ticket32113 b/changes/ticket32113 new file mode 100644 index 000000000..ef7978f1b --- /dev/null +++ b/changes/ticket32113 @@ -0,0 +1,3 @@ + o Minor features (doxygen): + - "make doxygen" now works with out-of-tree builds. Closes ticket + 32113.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2019