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

[torspec/master] Change status of proposal 304 to Accepted.
by asn＠torproject.org 06 Jun '19

06 Jun '19

commit 3ecd4eb46d2032a95ee6268444563953b5ecd893 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jun 6 14:28:21 2019 +0300 Change status of proposal 304 to Accepted. --- proposals/304-socks5-extending-hs-error-codes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/304-socks5-extending-hs-error-codes.txt b/proposals/304-socks5-extending-hs-error-codes.txt index 2c62dea..56a3487 100644 --- a/proposals/304-socks5-extending-hs-error-codes.txt +++ b/proposals/304-socks5-extending-hs-error-codes.txt @@ -2,7 +2,7 @@ Filename: 304-socks5-extending-hs-error-codes.txt Title: Extending SOCKS5 Onion Service Error Codes Author: David Goulet, George Kadianakis Created: 22-May-2019 -Status: Open +Status: Accepted Note: We are extending SOCKS5 here but in terms, when Tor Browser supports HTTPCONNECT, we should not do that anymore.

1 0

[torspec/master] prop304: Initial import for new SOCKS5 error code
by asn＠torproject.org 06 Jun '19

06 Jun '19

commit 767df0b55af888f135174883d9bda29c05c2d7eb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 22 14:47:59 2019 -0400 prop304: Initial import for new SOCKS5 error code Part of #30382 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/000-index.txt | 2 + proposals/304-socks5-extending-hs-error-codes.txt | 109 ++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index d10f917..b7f010c 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -224,6 +224,7 @@ Proposals by number: 301 Don't include package fingerprints in consensus documents [ACCEPTED] 302 Hiding onion service clients using padding [ACCEPTED] 303 When and how to remove support for protocol versions [DRAFT] +304 Extending SOCKS5 Onion Service Error Codes [OPEN] Proposals by status: @@ -256,6 +257,7 @@ Proposals by status: 295 Using ADL for relay cryptography (solving the crypto-tagging attack) 296 Have Directory Authorities expose raw bandwidth list files 299 Preferring IPv4 or IPv6 based on IP Version Failure Count + 304 Extending SOCKS5 Onion Service Error Codes ACCEPTED: 188 Bridge Guards and other anti-enumeration defenses 249 Allow CREATE cells with >505 bytes of handshake data diff --git a/proposals/304-socks5-extending-hs-error-codes.txt b/proposals/304-socks5-extending-hs-error-codes.txt new file mode 100644 index 0000000..2c62dea --- /dev/null +++ b/proposals/304-socks5-extending-hs-error-codes.txt @@ -0,0 +1,109 @@ +Filename: 304-socks5-extending-hs-error-codes.txt +Title: Extending SOCKS5 Onion Service Error Codes +Author: David Goulet, George Kadianakis +Created: 22-May-2019 +Status: Open + +Note: We are extending SOCKS5 here but in terms, when Tor Browser supports + HTTPCONNECT, we should not do that anymore. + +0. Abstract + + We propose extending the SOCKS5 protocol to allow returning more meaningful + response failure onion service codes back to the client. + + This is inspired by proposal 229 [PROP229] minus the new authentication + method. + +1. Introduction + + The motivation behind this proposal is because we need a synchronous way to + return a reason on why the SOCKS5 connection failed. + + The alternative is to use a control port event but then the caller needs to + match the SOCKS failure to the control event. And tor provides no guarantee + that a control event will be emitted before the SOCKS failure or vice + versa. + + With this proposal, the client can get the reason on why the onion service + connection failed with the SOCKS5 returned error code. + +2. Proposal + +2.1. New SocksPort Flag + + In order to have backward compatibility with third party applications that + do not support the new proposed SOCKS5 error code, we propose a new + SocksPort flag that needs to be set in the tor configuration file in order + for those code to be sent back. + + The new SocksPort flag is: + + "ExtendedErrors" -- Tor will report new SOCKS5 error code detailed below + in section 2.2 (once merged, they will end up in + socks-extension.txt). + + It is possible that more codes will be added in the future so an + application using this flag should possibly expect unknown codes to be + returned. + +2.2. Onion Service Extended SOCKS5 Error Code + + We introduce the following additional SOCKS5 reply codes to be sent in the + REP field of a SOCKS5 message iff the "ExtendedErrors" on the SocksPort is + set (see section 2.1 above). + + The SOCKS5 specification [RFC1928] defines a range of code that are + "unassigned" so we'll be using those on the far end of the range in order + to inform the client of onion service failures: + + Where: + + * X'F0' Onion Service Descriptor Can Not be Found + + The requested onion service descriptor can't be found on the hashring + and thus not reachable by the client. + + * X'F1' Onion Service Descriptor Is Invalid + + The requested onion service descriptor can't be parsed or signature + validation failed. + + * X'F2' Onion Service Introduction Failed + + Client failed to introduce to the service meaning the descriptor was + found but the service is not anymore at the introduction points. The + service has likely changed its descriptor or is not running. + + * X'F3' Onion Service Rendezvous Failed + + Client failed to rendezvous with the service which means that the client + is unable to finalize the connection. + + * X'F4' Onion Service Missing Client Authorization + + Tor was able to download the requested onion service descriptor but is + unable to decrypt its content because it is missing client authorization + information for it. + + * X'F5' Onion Service Wrong Client Authorization + + Tor was able to download the requested onion service descriptor but is + unable to decrypt its content using the client authorization information + it has. This means the client access were revoked. + +3. Compatibility + + No new field or extension has been added. Only new code values from the + unassigned range are being used. We expect these to not be a problem for + backward compatibility. + + These codes are only sent back if the new proposed SocksPort flag, + "ExtendedErrors", is set and making it easier for backward and foward + compatibility. + +References: + +[PROP229] https://gitweb.torproject.org/torspec.git/tree/proposals/229-further-socks5… + +[RFC1928] https://www.ietf.org/rfc/rfc1928.txt

1 0

[community/staging] Add inner page template for onion services
by pili＠torproject.org 06 Jun '19

06 Jun '19

commit a4f56a1067b8b81a315b331b0d6bab4686b30ed5 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 6 13:12:11 2019 +0200 Add inner page template for onion services --- content/onion-services/overview/contents.lr | 2 +- content/onion-services/setup/contents.lr | 2 +- content/onion-services/ssl-tls/contents.lr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/onion-services/overview/contents.lr b/content/onion-services/overview/contents.lr index f940fa2..1f9b25c 100644 --- a/content/onion-services/overview/contents.lr +++ b/content/onion-services/overview/contents.lr @@ -14,7 +14,7 @@ subtitle: Learn how .onion services work. --- key: 0 --- -html: onion-services.html +html: two-columns-page.html --- body: diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index 08be1b7..a37ff12 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -16,7 +16,7 @@ key: 1 --- cta: Get Started --- -html: onion-services.html +html: two-columns-page.html --- body: diff --git a/content/onion-services/ssl-tls/contents.lr b/content/onion-services/ssl-tls/contents.lr index a699036..ef630a5 100644 --- a/content/onion-services/ssl-tls/contents.lr +++ b/content/onion-services/ssl-tls/contents.lr @@ -16,7 +16,7 @@ key: 2 --- cta: Coming soon --- -html: onion-services.html +html: two-columns-page.html --- body:

1 0

[community/staging] sort topics by key
by pili＠torproject.org 06 Jun '19

06 Jun '19

commit 2aeb17bcb505c8eb5990ddffb6608df31a64ec19 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 6 13:12:36 2019 +0200 sort topics by key --- templates/sidenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index 489faeb..3732254 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -27,7 +27,7 @@ <nav class="d-none d-sm-block section-nav bg-white sidetopics sticky" id="sidenav-topics"> <h4 class="text-primary pl-4">{{ _("Topics") }}</h4> <ul class="nav nav-pills flex-column"> - {% for child in this.parent.children %} + {% for child in this.parent.children|sort(attribute='key') %} <li{% if this.is_child_of(child.path) %} class="toc-entry toc-h2 active nav-item" {% else %} class="toc-entry toc-h2 nav-item" {% endif %}> <a role="button" {% if this.is_child_of(child.path) %} class="nav-link active" {% else %} class="nav-link" {% endif %} href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a>

1 0

[community/staging] Fix issues with merge
by pili＠torproject.org 06 Jun '19

06 Jun '19

commit 5a78ce21bf6703ca3e07c6de229e555a976661d6 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 6 12:06:59 2019 +0200 Fix issues with merge --- content/onion-services/setup/contents.lr | 5 ----- 1 file changed, 5 deletions(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index 54dd91d..08be1b7 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -16,11 +16,6 @@ key: 1 --- cta: Get Started --- -<<<<<<< HEAD -cta: Get Started ---- -======= ->>>>>>> 456701b... Onion services html: onion-services.html --- body:

1 0

[community/staging] Use two columns template and fix current section pagenav underline
by pili＠torproject.org 06 Jun '19

06 Jun '19

commit 8b62be6aea4912af7df25538984ecc1ab7d902bb Author: hiro <hiro(a)torproject.org> Date: Tue Jun 4 19:36:23 2019 +0200 Use two columns template and fix current section pagenav underline --- .../becoming-tor-translator/contents.lr | 2 +- templates/localization.html | 6 +++ templates/pagenav.html | 6 ++- templates/sidenav.html | 44 ++++++++-------------- templates/two-columns-page.html | 6 +++ 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/content/localization/becoming-tor-translator/contents.lr b/content/localization/becoming-tor-translator/contents.lr index 2983a8a..7628797 100644 --- a/content/localization/becoming-tor-translator/contents.lr +++ b/content/localization/becoming-tor-translator/contents.lr @@ -13,7 +13,7 @@ subtitle: Becoming a translator for the Tor Project --- key: 1 --- -html: localization.html +html: two-columns-page.html --- body: diff --git a/templates/localization.html b/templates/localization.html index 23c5a44..d52e348 100644 --- a/templates/localization.html +++ b/templates/localization.html @@ -20,8 +20,14 @@ <div class="card h-100 border-0"> <div class="card-body"> <div class="card-body"> +<<<<<<< HEAD <h4 class="text-primary">.{{ child.key }}</h4> <h4 class="card-title text-primary"><a href="{{ child.path|url }}">{{ _(child.title) }}</a></h4> +======= + <h4 class="card-title text-primary"> + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + </h4> +>>>>>>> b231142... Use two columns template and fix current section pagenav underline <p class="card-text">{{ _(child.subtitle) }}</p> </div> </div> diff --git a/templates/pagenav.html b/templates/pagenav.html index 90f5ff9..37bfe58 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -4,11 +4,13 @@ <ul class="nav"> {% set menubag = 'pagenav' + '+' + this.alt %} {% for id, item in bag(menubag).items() %} - <li{% if this.path == '/' + item.path %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}> + {% set abs_path = item.path %} + <li{% if this.is_child_of(abs_path) %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}> {% set elm = site.get(item.path) %} {% if elm %} <a class="nav-link" href="{{ elm.path|url }}">{{ item.label }} - {% elif this.path == '/' + item.path %} + {% endif %} + {% if this.is_child_of(abs_path) %} <span class="sr-only">(current)</span> {% endif %} </a> diff --git a/templates/sidenav.html b/templates/sidenav.html index 8490aad..489faeb 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -1,7 +1,7 @@ <div class="container-fluid sidebar col-xs-12 col-sm-12 col-md-3 col-lg-3"> <nav class="smalltopics no-background navbar navbar-expand-lg navbar-light bg-white p-0 fixed"> <a class="text-primary bg-white font-weight-bold navbar-brand" href="#collapseTopicsNav"> - {{ _('Topics') }} + {{ _('Topics') }} </a> <label class="side-toggler" for="menu-toggle"> <a class="btn btn-lg outline-primary text-primary navbar-toggler chevron" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> @@ -13,40 +13,28 @@ <div class="collapse navbar-collapse burger-menu" id="navbarSupportedTopicsContent"> <ul class="nav nav-pills flex-column"> - {% set topicbag = 'topics+en' %} - {% for id, item in bag(topicbag).items() %} - <li{% if this.is_child_of(item.path) %} class="nav-item" {% else %} class="toc-entry toc-h2 nav-item"{% endif %}> - <a role="button" {% if this.is_child_of(item.path) %} class="side-nav active" {% else %} class="side-nav" {% endif %} - {% if this.is_child_of(this.parent) %} - href="../../{{ item.path }}"> - {% else %} - href="{{ item.path }}"> - {% endif %} - {{ _(item.label) }}</a> - </li> - {% endfor %} + {% for child in this.parent.children %} + <li{% if this.is_child_of(child.path) %} class="toc-entry toc-h2 active nav-item" {% else %} class="toc-entry toc-h2 nav-item" {% endif %}> + <a role="button" {% if this.is_child_of(child.path) %} class="nav-link active" {% else %} class="nav-link" {% endif %} + href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + </li> + {% endfor %} </ul> </div> <hr class="mb-0" /> </nav> - <nav class="d-none d-sm-block section-nav bg-white sidetopics sticky" id="sidenav-topics"> - <h4 class="text-primary pl-4">{{ _('Topics') }}</h4> + <h4 class="text-primary pl-4">{{ _("Topics") }}</h4> <ul class="nav nav-pills flex-column"> - {% set topicbag = 'topics+en' %} - {% for id, item in bag(topicbag).items() %} - <li{% if this.is_child_of(item.path) %} class="nav-item" {% else %} class="toc-entry toc-h2 nav-item"{% endif %}> - <a role="button" {% if this.is_child_of(item.path) %} class="side-nav active" {% else %} class="side-nav" {% endif %} - {% if this.is_child_of(this.parent) %} - href="../../{{ item.path }}"> - {% else %} - href="{{ item.path }}"> - {% endif %} - {{ _(item.label) }}</a> - </li> - - {% endfor %} + {% for child in this.parent.children %} + <li{% if this.is_child_of(child.path) %} class="toc-entry toc-h2 active nav-item" {% else %} class="toc-entry toc-h2 nav-item" {% endif %}> + <a role="button" {% if this.is_child_of(child.path) %} class="nav-link active" {% else %} class="nav-link" {% endif %} + href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + </li> + {% endfor %} </ul> </nav> + + </div> diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html new file mode 100644 index 0000000..e1f1839 --- /dev/null +++ b/templates/two-columns-page.html @@ -0,0 +1,6 @@ +<div class="row pt-5"> + {% include 'sidenav.html' %} + <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> + {{ this.body }} + </div> +</div>

1 0

[community/staging] remove automatically generated translation files
by pili＠torproject.org 06 Jun '19

06 Jun '19

commit ec15b8355c5ea412aa96b3da0ba979a477a3341b Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jun 4 20:36:41 2019 +0200 remove automatically generated translation files --- content/onion-services/contents+en.lr | 23 ----------------------- content/training/contents+en.lr | 23 ----------------------- content/training/contents+es.lr | 23 ----------------------- content/training/contents+fr.lr | 23 ----------------------- 4 files changed, 92 deletions(-) diff --git a/content/onion-services/contents+en.lr b/content/onion-services/contents+en.lr deleted file mode 100644 index 0077c71..0000000 --- a/content/onion-services/contents+en.lr +++ /dev/null @@ -1,23 +0,0 @@ -section: onion services ---- -section_id: onion-services ---- -color: primary ---- -_template: layout.html ---- -title: .onion Services ---- -subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services. ---- -cta: Grow your .onion ---- -key: 6 ---- -html: onion-services.html ---- -body: - -##What are Onion Services? - -Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser. diff --git a/content/training/contents+en.lr b/content/training/contents+en.lr deleted file mode 100644 index 1cb0f37..0000000 --- a/content/training/contents+en.lr +++ /dev/null @@ -1,23 +0,0 @@ -section: training ---- -section_id: training ---- -color: primary ---- -_template: layout.html ---- -title: Training ---- -subtitle: Do you teach your community about using Tor? These resources are for you. ---- -cta: Check our resources ---- -key: 1 ---- -html: training.html ---- -body: - -##We want to teach the world about Tor. Will you help? - -Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. diff --git a/content/training/contents+es.lr b/content/training/contents+es.lr deleted file mode 100644 index 1cb0f37..0000000 --- a/content/training/contents+es.lr +++ /dev/null @@ -1,23 +0,0 @@ -section: training ---- -section_id: training ---- -color: primary ---- -_template: layout.html ---- -title: Training ---- -subtitle: Do you teach your community about using Tor? These resources are for you. ---- -cta: Check our resources ---- -key: 1 ---- -html: training.html ---- -body: - -##We want to teach the world about Tor. Will you help? - -Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. diff --git a/content/training/contents+fr.lr b/content/training/contents+fr.lr deleted file mode 100644 index 1cb0f37..0000000 --- a/content/training/contents+fr.lr +++ /dev/null @@ -1,23 +0,0 @@ -section: training ---- -section_id: training ---- -color: primary ---- -_template: layout.html ---- -title: Training ---- -subtitle: Do you teach your community about using Tor? These resources are for you. ---- -cta: Check our resources ---- -key: 1 ---- -html: training.html ---- -body: - -##We want to teach the world about Tor. Will you help? - -Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact].

1 0

[community/staging] remove titles from templates
by pili＠torproject.org 06 Jun '19

06 Jun '19

commit b817a0c3f153175659dbbbc7da69fa13380e5d29 Author: Antonela <hola(a)antonela.me> Date: Mon Jun 3 15:57:23 2019 -0300 remove titles from templates --- content/localization/contents.lr | 2 ++ content/onion-services/contents+en.lr | 2 ++ content/onion-services/contents+es.lr | 23 +++++++++++++++++++++++ content/onion-services/contents+fr.lr | 23 +++++++++++++++++++++++ content/onion-services/contents.lr | 2 ++ content/outreach/contents+en.lr | 23 +++++++++++++++++++++++ content/outreach/contents+es.lr | 23 +++++++++++++++++++++++ content/outreach/contents+fr.lr | 23 +++++++++++++++++++++++ content/outreach/contents.lr | 2 ++ content/training/contents+en.lr | 23 +++++++++++++++++++++++ content/training/contents+es.lr | 23 +++++++++++++++++++++++ content/training/contents+fr.lr | 23 +++++++++++++++++++++++ content/training/contents.lr | 6 +++++- templates/localization.html | 4 ++++ templates/onion-services.html | 35 +++++------------------------------ templates/outreach.html | 4 ++++ templates/relay-operations.html | 4 ++++ templates/training.html | 4 ++++ templates/user-testing.html | 5 +++++ 19 files changed, 223 insertions(+), 31 deletions(-) diff --git a/content/localization/contents.lr b/content/localization/contents.lr index 6d0113f..8ae4ef0 100644 --- a/content/localization/contents.lr +++ b/content/localization/contents.lr @@ -18,6 +18,8 @@ html: localization.html --- body: +##Localization is how we reach a global community. + 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 the [Tor Browser](https://torpat.ch/locales), its documentation and the [Tor Project website](https://torpat.ch/tpo-locales), and there are always other documents to translate. diff --git a/content/onion-services/contents+en.lr b/content/onion-services/contents+en.lr index c469f31..0077c71 100644 --- a/content/onion-services/contents+en.lr +++ b/content/onion-services/contents+en.lr @@ -18,4 +18,6 @@ html: onion-services.html --- body: +##What are Onion Services? + Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser. diff --git a/content/onion-services/contents+es.lr b/content/onion-services/contents+es.lr new file mode 100644 index 0000000..0077c71 --- /dev/null +++ b/content/onion-services/contents+es.lr @@ -0,0 +1,23 @@ +section: onion services +--- +section_id: onion-services +--- +color: primary +--- +_template: layout.html +--- +title: .onion Services +--- +subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services. +--- +cta: Grow your .onion +--- +key: 6 +--- +html: onion-services.html +--- +body: + +##What are Onion Services? + +Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser. diff --git a/content/onion-services/contents+fr.lr b/content/onion-services/contents+fr.lr new file mode 100644 index 0000000..0077c71 --- /dev/null +++ b/content/onion-services/contents+fr.lr @@ -0,0 +1,23 @@ +section: onion services +--- +section_id: onion-services +--- +color: primary +--- +_template: layout.html +--- +title: .onion Services +--- +subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services. +--- +cta: Grow your .onion +--- +key: 6 +--- +html: onion-services.html +--- +body: + +##What are Onion Services? + +Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser. diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index c469f31..0077c71 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -18,4 +18,6 @@ html: onion-services.html --- body: +##What are Onion Services? + Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser. diff --git a/content/outreach/contents+en.lr b/content/outreach/contents+en.lr new file mode 100644 index 0000000..f11f905 --- /dev/null +++ b/content/outreach/contents+en.lr @@ -0,0 +1,23 @@ +section: outreach +--- +section_id: outreach +--- +color: primary +--- +_template: layout.html +--- +title: Outreach +--- +subtitle: Bring Tor swag to our next community event. +--- +cta: Join the Tor community +--- +key: 3 +--- +html: outreach.html +--- +body: + +##Tell the world about Tor + +We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach. diff --git a/content/outreach/contents+es.lr b/content/outreach/contents+es.lr new file mode 100644 index 0000000..f11f905 --- /dev/null +++ b/content/outreach/contents+es.lr @@ -0,0 +1,23 @@ +section: outreach +--- +section_id: outreach +--- +color: primary +--- +_template: layout.html +--- +title: Outreach +--- +subtitle: Bring Tor swag to our next community event. +--- +cta: Join the Tor community +--- +key: 3 +--- +html: outreach.html +--- +body: + +##Tell the world about Tor + +We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach. diff --git a/content/outreach/contents+fr.lr b/content/outreach/contents+fr.lr new file mode 100644 index 0000000..f11f905 --- /dev/null +++ b/content/outreach/contents+fr.lr @@ -0,0 +1,23 @@ +section: outreach +--- +section_id: outreach +--- +color: primary +--- +_template: layout.html +--- +title: Outreach +--- +subtitle: Bring Tor swag to our next community event. +--- +cta: Join the Tor community +--- +key: 3 +--- +html: outreach.html +--- +body: + +##Tell the world about Tor + +We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach. diff --git a/content/outreach/contents.lr b/content/outreach/contents.lr index 331a434..2b271cb 100644 --- a/content/outreach/contents.lr +++ b/content/outreach/contents.lr @@ -18,4 +18,6 @@ html: outreach.html --- body: +##Tell the world about Tor + We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach. diff --git a/content/training/contents+en.lr b/content/training/contents+en.lr new file mode 100644 index 0000000..1cb0f37 --- /dev/null +++ b/content/training/contents+en.lr @@ -0,0 +1,23 @@ +section: training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Training +--- +subtitle: Do you teach your community about using Tor? These resources are for you. +--- +cta: Check our resources +--- +key: 1 +--- +html: training.html +--- +body: + +##We want to teach the world about Tor. Will you help? + +Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. diff --git a/content/training/contents+es.lr b/content/training/contents+es.lr new file mode 100644 index 0000000..1cb0f37 --- /dev/null +++ b/content/training/contents+es.lr @@ -0,0 +1,23 @@ +section: training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Training +--- +subtitle: Do you teach your community about using Tor? These resources are for you. +--- +cta: Check our resources +--- +key: 1 +--- +html: training.html +--- +body: + +##We want to teach the world about Tor. Will you help? + +Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. diff --git a/content/training/contents+fr.lr b/content/training/contents+fr.lr new file mode 100644 index 0000000..1cb0f37 --- /dev/null +++ b/content/training/contents+fr.lr @@ -0,0 +1,23 @@ +section: training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Training +--- +subtitle: Do you teach your community about using Tor? These resources are for you. +--- +cta: Check our resources +--- +key: 1 +--- +html: training.html +--- +body: + +##We want to teach the world about Tor. Will you help? + +Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. diff --git a/content/training/contents.lr b/content/training/contents.lr index 5fa7f6a..1845385 100644 --- a/content/training/contents.lr +++ b/content/training/contents.lr @@ -18,6 +18,10 @@ html: training.html --- body: -Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. +##We want to teach the world about Tor. Will you help? +<<<<<<< HEAD For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please [contact our community team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam… for more help. +======= +Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. +>>>>>>> f8fadcc... remove titles from templates diff --git a/templates/localization.html b/templates/localization.html index fe54039..23c5a44 100644 --- a/templates/localization.html +++ b/templates/localization.html @@ -1,7 +1,11 @@ <div class="container py-5"> <h2 class="text-primary">{{ _('Localization is how we reach a global community.') }}</h2> <div class="row py-5"> +<<<<<<< HEAD <div class="col-8"> +======= + <div class="col-lg-7"> +>>>>>>> f8fadcc... remove titles from templates {{ this.body }} </div> <div class="col-4 bg-light"> diff --git a/templates/onion-services.html b/templates/onion-services.html index fe9f3da..ee3051a 100644 --- a/templates/onion-services.html +++ b/templates/onion-services.html @@ -1,18 +1,16 @@ <div class="container py-5"> - <h2 class="text-primary">{{ _('What are Onion Services?') }}</h2> <div class="row py-5"> - <div class="col-8"> + <div class="col-lg-7"> {{ this.body }} </div> - <div class="col-4 bg-light"> - <div class="illo-container"> - <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ this.section }}" /> - </div> + <div class="col-lg-5"> + <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> <a href="{{ this.path|url }}overview/"><h2 class="text-primary"><u>{{ _('Learn more about onion services here') }} <i class="fas fa-arrow-right"></i></u> </h2></a> + <div class="row py-5"> {% for child in this.children|sort(attribute='key') %} {% if child.key != '0' %} @@ -45,30 +43,7 @@ <div class="col-6"> <a href="https://github.com/alecmuffett/eotk"><h3 class="text-primary text-center mx-auto"><u>{{ _('Check out the code') }} <i class="fas fa-arrow-right"></i></u> - </h3></a> - </div> - </div> - <div class="row py-5 text-center mx-auto"> - <h2 class="display-4 text-primary text-center mx-auto">{{ _('Featured .onion sites') }}</h2> - </div> - <div class="row mx-auto"> - <div class="col-4"> - <div class="illo-container"> - <img src="/static/images/{{ this.section_id }}/onion-sites/Tor.svg" class="img-fluid" alt="{{ _('Tor Project') }}" /> - </div> - <a href="http://expyuzz4wqqyqhjn.onion/"><u>{{ _('http://expyuzz4wqqyqhjn.onion/') }}</u></a> - </div> - <div class="col-4"> - <div class="illo-container"> - <img src="/static/images/{{ this.section_id }}/onion-sites/propublica.svg" class="img-fluid" alt="{{ _('ProPublica') }}" /> - </div> - <a href="https://p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd.onion/"><u>{{ _('https://p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd.onion/') }}</u></a> - </div> - <div class="col-4"> - <div class="illo-container"> - <img src="/static/images/{{ this.section_id }}/onion-sites/nyt.png" class="img-fluid" alt="{{ _('The New York Times') }}" /> - </div> - <a href="https://www.nytimes3xbfgragh.onion/"><u>{{ _('https://www.nytimes3xbfgragh.onion/') }}</u></a> + </h3> </div> </div> </div> diff --git a/templates/outreach.html b/templates/outreach.html index 842681c..b66b8ca 100644 --- a/templates/outreach.html +++ b/templates/outreach.html @@ -1,7 +1,11 @@ <div class="container py-5"> <h2 class="text-primary">{{ _('Tell the world about Tor!') }}</h2> <div class="row py-5"> +<<<<<<< HEAD <div class="col-8"> +======= + <div class="col-lg-7"> +>>>>>>> f8fadcc... remove titles from templates {{ this.body }} </div> <div class="col-4 bg-light"> diff --git a/templates/relay-operations.html b/templates/relay-operations.html index e861c25..4fc7cdf 100644 --- a/templates/relay-operations.html +++ b/templates/relay-operations.html @@ -1,6 +1,10 @@ <div class="container py-5"> <div class="row py-5"> +<<<<<<< HEAD <div class="col-8"> +======= + <div class="col-lg-7"> +>>>>>>> f8fadcc... remove titles from templates {{ this.body }} </div> <div class="col-4 bg-light"> diff --git a/templates/training.html b/templates/training.html index 6d85952..84bc1de 100644 --- a/templates/training.html +++ b/templates/training.html @@ -1,7 +1,11 @@ <div class="container py-5"> <h2 class="text-primary">{{ _('We want to teach the world about Tor. Will you help?') }}</h2> <div class="row py-5"> +<<<<<<< HEAD <div class="col-8"> +======= + <div class="col-lg-7"> +>>>>>>> f8fadcc... remove titles from templates {{ this.body }} </div> <div class="col-4 bg-light"> diff --git a/templates/user-testing.html b/templates/user-testing.html index 8784f2a..e7d4441 100644 --- a/templates/user-testing.html +++ b/templates/user-testing.html @@ -1,7 +1,12 @@ <div class="container py-5"> +<<<<<<< HEAD:templates/user-testing.html <h2 class="text-primary">{{ _('Testing Tor features while respecting user privacy') }}</h2> <div class="row py-5"> <div class="col-8"> +======= + <div class="row pt-5"> + <div class="col-lg-7"> +>>>>>>> f8fadcc... remove titles from templates:templates/user-research.html {{ this.body }} </div> <div class="col-4 bg-light">

1 0

[community/staging] Fix onion services overview image paths
by pili＠torproject.org 06 Jun '19

06 Jun '19

commit f0baed054c6738f675bb2bff46f045405e4970d2 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Jun 6 12:08:59 2019 +0200 Fix onion services overview image paths --- content/onion-services/overview/contents.lr | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/onion-services/overview/contents.lr b/content/onion-services/overview/contents.lr index f62f927..f940fa2 100644 --- a/content/onion-services/overview/contents.lr +++ b/content/onion-services/overview/contents.lr @@ -60,7 +60,7 @@ Here is a detailed breakdown of how this happens: ### Act 1: Where the onion service sets up its introduction points -![Onion Services: Step 1](/static/images/onion-services/tor-onion-services-1.png) +![Onion Services: Step 1](/static/images/onion-services/overview/tor-onion-services-1.png) As the first step in the protocol, Bob (the onion service) contacts a bunch of Tor relays and asks them to act as his _introduction points_, by establishing long-term circuits to them. These circuits are anonymized circuits, so Bob does not reveal his locations to his introduction points. @@ -69,7 +69,7 @@ As part of this step, Bob gives its introduction point a special "authentication ### Act 2: Where the onion service publishes its descriptors -![Onion Services: Step 2](/static/images/onion-services/tor-onion-services-2.png) +![Onion Services: Step 2](/static/images/onion-services/overview/tor-onion-services-2.png) Now that the introduction points are setup, we need to create a way for clients to be able to find them. @@ -84,7 +84,7 @@ Bob uses an anonymized Tor circuit to do this upload, so that he does not reveal All the previous steps were just setup for the onion service so that it's reachable by clients. Now let's fast-forward to the point where an actual client wants to visit the service: -![Onion Services: Step 3](/static/images/onion-services/tor-onion-services-3.png) +![Onion Services: Step 3](/static/images/onion-services/overview/tor-onion-services-3.png) In this case, Alice (the client) has the onion address of Bob and she wants to visit it, so she connects to it with her Tor Browser. Now the next thing that needs to happen is that Alice goes to the _distributed hash table_ from the step above, and ask for the signed descriptor of Bob. @@ -100,14 +100,14 @@ Alice asks the relay to become her _rendezvous point_ and gives it an "one-time ### Act 5: Where the client introduces itself to the onion service -![Onion Services: Step 4](/static/images/onion-services/tor-onion-services-4.png) +![Onion Services: Step 4](/static/images/onion-services/overview/tor-onion-services-4.png) Now, Alice goes ahead and connects to one of Bob's introduction points and introduces herself to Bob. Through this introduction Bob learns Alice's choice of rendezvous point and the "one-time secret". ### Act 6: Where the onion service rendezvous with the client -![Onion Services: Step 5](/static/images/onion-services/tor-onion-services-5.png) +![Onion Services: Step 5](/static/images/onion-services/overview/tor-onion-services-5.png) In this last act, the onion service is now aware of Alice's rendezvous point. The onion service connects to the rendezvous point (through an anonymized circuit) and sends the "one-time secret" to it. @@ -118,7 +118,7 @@ The rendezvous point simply relays (end-to-end encrypted) messages from client t In general, the complete connection between client and onion service consists of 6 relays: 3 of them were picked by the client with the third being the rendezvous point and the other 3 were picked by the onion service. This provides _location hiding_ to this connection: -![Onion Services: Step 6](/static/images/onion-services/tor-onion-services-6.png) +![Onion Services: Step 6](/static/images/onion-services/overview/tor-onion-services-6.png) ## Further resources

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 06 Jun '19

06 Jun '19

commit 8dbbdc2a6d0ccf1388476ced6b22fece0c8adcbb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 6 08:18:16 2019 +0000 Update translations for tor-and-https_completed --- km.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/km.po b/km.po index 198799e1c..72f3f912f 100644 --- a/km.po +++ b/km.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2019-05-21 06:11+0000\n" -"Last-Translator: Moses Ngeth\n" +"PO-Revision-Date: 2019-06-06 07:53+0000\n" +"Last-Translator: Kanika Chhit\n" "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0