tor-commits October 2019

tor-commits@lists.torproject.org

22 participants
4141 discussions

[tpo/staging] Add Trademark tab to About
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 375c924c624dbfa2c7354492c2289809ef08b7c9 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 12:06:30 2019 -0400 Add Trademark tab to About --- databags/about+en.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/databags/about+en.ini b/databags/about+en.ini index 43f44fd..8322613 100644 --- a/databags/about+en.ini +++ b/databags/about+en.ini @@ -17,3 +17,7 @@ label = Reports [jobs] path = about/jobs label = Jobs + +[trademark] +path = about/trademark +label = Trademark

1 0

[tpo/staging] Fix trademark models and templates
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 593f085a54a3eae28732e4f8bb705c5cc8e1a8d8 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:22:04 2019 +0200 Fix trademark models and templates --- content/about/trademark/contents.lr | 5 ++++ content/about/trademark/trademark-faq/contents.lr | 12 +++++++- .../trademark-faq/trademark-faq-1/contents.lr | 2 ++ .../trademark-faq/trademark-faq-2/contents.lr | 2 ++ .../trademark-faq/trademark-faq-3/contents.lr | 2 ++ .../trademark-faq/trademark-faq-4/contents.lr | 2 ++ .../trademark-faq/trademark-faq-5/contents.lr | 2 ++ .../trademark-faq/trademark-faq-6/contents.lr | 2 ++ .../trademark-faq/trademark-faq-7/contents.lr | 2 ++ models/question.ini | 1 + models/trademark.ini | 34 ++++++++++++++++++++++ templates/about.html | 9 +++++- templates/macros/topic.html | 2 +- templates/trademark.html | 2 +- 14 files changed, 75 insertions(+), 4 deletions(-) diff --git a/content/about/trademark/contents.lr b/content/about/trademark/contents.lr index bc35d46..1dc524d 100644 --- a/content/about/trademark/contents.lr +++ b/content/about/trademark/contents.lr @@ -1,14 +1,19 @@ +_model: trademark +--- _template: about.html --- section: About --- section_id: about --- +color: primary +--- html: trademark.html --- title: Trademark --- body: + # General Statement of Trademark and Copyright Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a [Creative Commons Attribution 3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/). All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to change licenses and permissions at any time in its sole discretion. diff --git a/content/about/trademark/trademark-faq/contents.lr b/content/about/trademark/trademark-faq/contents.lr index 35a1f52..464fb37 100644 --- a/content/about/trademark/trademark-faq/contents.lr +++ b/content/about/trademark/trademark-faq/contents.lr @@ -1,5 +1,15 @@ _model: topic --- +_template: about.html +--- +section: About +--- +section_id: about +--- +html: trademark.html +--- +color: primary +--- title: Tor Trademark Frequently Asked Questions --- -seo_slug: Tor Trademark FAQs +seo_slug: tor-trademark-faqs diff --git a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr index 9c53669..0d60105 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: How can I use the name "Tor"? --- +_hidden: yes +--- seo_slug: how-to-use-tor-trademark --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr index a8ac499..7e6fc04 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: Can I use the Tor onion logo? --- +_hidden: yes +--- seo_slug: can-I-use-tor-onion-logo --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr index a7fe8bb..06c3770 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: Can I use the word "Tor" as part of the name of my product or my domain name? --- +_hidden: yes +--- seo_slug: tor-product-domain-name --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr index 534a68b..80a8b9e 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: What about cute Tor-derived names in research paper titles? --- +_hidden: yes +--- seo_slug: tor-derived-names --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr index 8f74633..e621368 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: Does this mean you're enforcing trademark rights? --- +_hidden: yes +--- seo_slug: enforcing-trademark-rights --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr index 32dd43e..ab1a3e8 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: What if I produce non-open source, commercial products based on Tor? --- +_hidden: yes +--- seo_slug: commercial-tor-derivatives --- description: diff --git a/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr index 7f5b9c5..85d599b 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-7/contents.lr @@ -2,6 +2,8 @@ _model: question --- title: Are there official licensees of the Tor trademarks? --- +_hidden: yes +--- seo_slug: tor-licensees --- description: diff --git a/models/question.ini b/models/question.ini index 5e01769..fecf955 100644 --- a/models/question.ini +++ b/models/question.ini @@ -2,6 +2,7 @@ name = Question label = {{ this.title }} translate = True +hidden = yes [fields.title] label = Title diff --git a/models/trademark.ini b/models/trademark.ini new file mode 100644 index 0000000..892b5f1 --- /dev/null +++ b/models/trademark.ini @@ -0,0 +1,34 @@ +[model] +name = Trademark +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string +translate = True + +[fields.section_id] +label = Section_id +type = string +translate = False + +[fields.body] +label = Body +type = markdown + +[fields.color] +label = Color +type = string + +[fields.html] +label = Html +type = string + +[children] +model = topic +order_by = title diff --git a/templates/about.html b/templates/about.html index 706617d..d1ab9de 100644 --- a/templates/about.html +++ b/templates/about.html @@ -8,7 +8,14 @@ <div class="container-fluid"> <div class="row flex-xl-nowrap"> <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> - {% if this.path == "/about/history" %} + {% if this.path == "/about" %} + {% set p1 = this.children.get('history') %} + <div class="container py-3 mt-5 content"> + <div class="col-sm-9"> + {{ p1.body }} + </div> + </div> + {% elif this.path == "/about/history" %} <div class="container py-3 mt-5 preamble"> {{ this.parent.body }} </div> diff --git a/templates/macros/topic.html b/templates/macros/topic.html index 2558e79..0439c82 100644 --- a/templates/macros/topic.html +++ b/templates/macros/topic.html @@ -9,7 +9,7 @@ <div id="{{ t.control }}" role="tabpanel" data-parent="#topics" class="anchor-spacer"> <div id="{{ t.control }}Accordion" data-children=".question"> <h5 class="text-muted mb-3 p-0 {{ bag('alternatives', alternative, 'direction') }}">{{ item.title }}</h5> - {% for q in item.children %} + {% for q in site.query(item.path).include_undiscoverable(true) %} {{ render_question(q, item._id, alternative) }} {% endfor %} </div> diff --git a/templates/trademark.html b/templates/trademark.html index 5794309..f37aa27 100644 --- a/templates/trademark.html +++ b/templates/trademark.html @@ -1,6 +1,6 @@ {% from "macros/topic.html" import render_topic %} <div class="container py3"> - {% for item in this.children %} + {% for item in site.query('/about/trademark').include_hidden(true) %} {{ render_topic(item, this.alt) }} {% endfor %} </div>

1 0

[tpo/staging] Modify link in `trademark-faq-4`
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 4d7d44939c1281e9feaa46c4b85a6b6ab88ad2ba Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 14:57:20 2019 -0400 Modify link in `trademark-faq-4` Now it links to the "Can I use the word "Tor"" question on the new page. --- content/about/trademark/trademark-faq/trademark-faq-4/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr index b366a4d..534a68b 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr @@ -9,4 +9,4 @@ Tor enjoys a vibrant [research community](https://research.torproject.org/) that Since the authors of these research papers aren't trying to make a profit from them, and (because they're just papers, not products) the papers aren't confusing Tor users into running potentially unsafe software, we believe that the use of the Tor mark in these research paper titles is acceptable non-trademark or fair use. -That said, if the research paper comes with software, and that software could potentially confuse people (users or other researchers) about whether it's written or endorsed by The Tor Project, then we're back to the [above scenario](https://2019.www.torproject.org/docs/trademark-faq.html.en#combin…. +That said, if the research paper comes with software, and that software could potentially confuse people (users or other researchers) about whether it's written or endorsed by The Tor Project, then we're back to the [above scenario](../../#trademark-faq-3).

1 0

[tpo/staging] Fix question permalinks
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 5c20a565298dc373408bc055d370258ed8e748f6 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 13:39:39 2019 -0400 Fix question permalinks --- templates/macros/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/question.html b/templates/macros/question.html index 8a2501f..1b5fa59 100644 --- a/templates/macros/question.html +++ b/templates/macros/question.html @@ -13,7 +13,7 @@ <li class="list-group-item"> <a href="https://github.com/torproject/tpo/edit/master/content{{ item.path }}/contents.lr">{{ _("Edit this page") }}</a> - <a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…">{{ _("Suggest Feedback") }}</a> - - <a href="{{ item|url }}">{{ _("Permalink") }}</a> + <a href="#{{ item._id }}" data-target="#{{ item._id }}">{{ _("Permalink") }}</a> </li> </ul> </div>

1 0

[tpo/staging] Add Trademark content
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit cee1e598a4238a532155d72bfdb2c3028f860d29 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 12:06:26 2019 -0400 Add Trademark content --- content/about/trademark/contents.lr | 59 +++++++++++++++++++++++++++++++++++++ templates/trademark.html | 1 + 2 files changed, 60 insertions(+) diff --git a/content/about/trademark/contents.lr b/content/about/trademark/contents.lr new file mode 100644 index 0000000..1f2d76f --- /dev/null +++ b/content/about/trademark/contents.lr @@ -0,0 +1,59 @@ +_template: about.html +--- +section: About +--- +section_id: about +--- +html: trademark.html +--- +color: primary +--- +title: Trademark +--- +body: +# General Statement of Trademark and Copyright + +Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a [Creative Commons Attribution 3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/). All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to change licenses and permissions at any time in its sole discretion. + +The Tor® software is licensed in various ways. Learn more about the [various licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor). + +# Tor Trademark Frequently Asked Questions +## How can I use the name "Tor"? + +The Tor Project encourages developers to use the name Tor in ways that do not confuse the public about the source of anonymity software and services. If you are building open-source non-commercial software or services that incorporate or work with The Tor Project's code, you may use the name “Tor” in an accurate description of your work. We ask you to include a link to the official Tor website https://www.torproject.org/ so users can verify the original source of Tor for themselves, and a note indicating that your project is not sponsored by The Tor Project. For example, “This product is produced independently from the Tor® anonymity software and carries no guarantee from The Tor Project about quality, suitability or anything else.” + +## Can I use the Tor onion logo? + +If you're making non-commercial use of Tor software, you may also use the Tor onion logo (as an illustration, not as a brand for your products). Please don't modify the design or colors of the logo. You can use items that look like the Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for instance), so long as they're not used as logos in ways that would confuse people. + +## Can I use the word "Tor" as part of the name of my product or my domain name? + +Please don't use Tor in your product name or domain name. Instead, find a name that will accurately identify your products or services. Remember that our goal is to make sure that people aren't confused about whether your product or project is made or endorsed by The Tor Project. Creating a new brand that incorporates the Tor brand is likely to lead to confusion, and commercial confusion is a sign of trademark infringement. + +## What about cute Tor-derived names in research paper titles? + +Tor enjoys a vibrant [research community](https://research.torproject.org/) that examines anonymity attacks and defenses, design improvements, impact on society, and so on. We think it's great that professors and other researchers continue to contribute to our community, and we've even gotten funding from the National Science Foundation to help keep the Tor design and code researcher-friendly. The [anonymity bibliography](http://freehaven.net/anonbib/) lists many research papers that use Tor-derived names in their titles: Torsk, DefenestraTor, Tortoise, LASTor, Torchestra, StegoTorus, and more. + +Since the authors of these research papers aren't trying to make a profit from them, and (because they're just papers, not products) the papers aren't confusing Tor users into running potentially unsafe software, we believe that the use of the Tor mark in these research paper titles is acceptable non-trademark or fair use. + +That said, if the research paper comes with software, and that software could potentially confuse people (users or other researchers) about whether it's written or endorsed by The Tor Project, then we're back to the [above scenario](https://2019.www.torproject.org/docs/trademark-faq.html.en#combin…. + +## Does this mean you're enforcing trademark rights? + +The Tor Project is a non-profit corporation organized to research and develop the Tor anonymity software and network. We don't want to be trademark bullies, but we will use trademark to protect the public's ability to recognize Tor Project software. Trademark law helps us to assure that the name is used only in connection with genuine Tor anonymity software and for accurate description of software and services. After all, to protect their anonymity securely, computer users must be able to identify the software they are using, so they can account properly for its strengths and weaknesses. Tor has become well-known as a software package and associated network of onion-routing anonymizing proxies, with online documentation, instructions for strengthening anonymity protection, and warnings that even at this stage it remains experimental software. We work with developers to improve the software and network and actively encourage researchers to document attacks to help us strengthen its a nonymity protection further. We distribute the software itself freely, but require correct attribution. + +We hold two trademarks in the United States: + +- Tor Onion Logo, U.S. Trademark Registration No. 3,465,433 +- Tor, U.S. Registration No. 3,465,432. + +## What if I produce non-open source, commercial products based on Tor? + +Contact us, and let's talk. + +## Are there official licensees of the Tor trademarks? + +Yes. A few open source, non-commercial projects are Tor trademark licensees: + +- [The Amnesic Incognito Live System](https://tails.boum.org/) +- Vidalia diff --git a/templates/trademark.html b/templates/trademark.html new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/templates/trademark.html @@ -0,0 +1 @@ +

1 0

[tpo/staging] Insert line breaks between sentences
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 3c6c67a6598276b94a5974ec5b0c8443b4a118c9 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Thu Sep 5 08:23:14 2019 -0400 Insert line breaks between sentences This creates smaller strings on each line which are easier to translate. --- content/about/trademark/trademark-faq/trademark-faq-1/contents.lr | 5 ++++- content/about/trademark/trademark-faq/trademark-faq-2/contents.lr | 4 +++- content/about/trademark/trademark-faq/trademark-faq-3/contents.lr | 5 ++++- content/about/trademark/trademark-faq/trademark-faq-4/contents.lr | 4 +++- content/about/trademark/trademark-faq/trademark-faq-5/contents.lr | 8 +++++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr index 0d60105..868bf04 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-1/contents.lr @@ -7,4 +7,7 @@ _hidden: yes seo_slug: how-to-use-tor-trademark --- description: -The Tor Project encourages developers to use the name Tor in ways that do not confuse the public about the source of anonymity software and services. If you are building open-source non-commercial software or services that incorporate or work with The Tor Project's code, you may use the name “Tor” in an accurate description of your work. We ask you to include a link to the official Tor website https://www.torproject.org/ so users can verify the original source of Tor for themselves, and a note indicating that your project is not sponsored by The Tor Project. For example, “This product is produced independently from the Tor® anonymity software and carries no guarantee from The Tor Project about quality, suitability or anything else.” +The Tor Project encourages developers to use the name Tor in ways that do not confuse the public about the source of anonymity software and services. +If you are building open-source non-commercial software or services that incorporate or work with The Tor Project's code, you may use the name “Tor” in an accurate description of your work. +We ask you to include a link to the official Tor website https://www.torproject.org/ so users can verify the original source of Tor for themselves, and a note indicating that your project is not sponsored by The Tor Project. +For example, “This product is produced independently from the Tor® anonymity software and carries no guarantee from The Tor Project about quality, suitability or anything else.” diff --git a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr index 7e6fc04..48c3110 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-2/contents.lr @@ -7,4 +7,6 @@ _hidden: yes seo_slug: can-I-use-tor-onion-logo --- description: -If you're making non-commercial use of Tor software, you may also use the Tor onion logo (as an illustration, not as a brand for your products). Please don't modify the design or colors of the logo. You can use items that look like the Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for instance), so long as they're not used as logos in ways that would confuse people. +If you're making non-commercial use of Tor software, you may also use the Tor onion logo (as an illustration, not as a brand for your products). +Please don't modify the design or colors of the logo. +You can use items that look like the Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for instance), so long as they're not used as logos in ways that would confuse people. diff --git a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr index 06c3770..009c265 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-3/contents.lr @@ -7,4 +7,7 @@ _hidden: yes seo_slug: tor-product-domain-name --- description: -Please don't use Tor in your product name or domain name. Instead, find a name that will accurately identify your products or services. Remember that our goal is to make sure that people aren't confused about whether your product or project is made or endorsed by The Tor Project. Creating a new brand that incorporates the Tor brand is likely to lead to confusion, and commercial confusion is a sign of trademark infringement. +Please don't use Tor in your product name or domain name. +Instead, find a name that will accurately identify your products or services. +Remember that our goal is to make sure that people aren't confused about whether your product or project is made or endorsed by The Tor Project. +Creating a new brand that incorporates the Tor brand is likely to lead to confusion, and commercial confusion is a sign of trademark infringement. diff --git a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr index 80a8b9e..c553f28 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-4/contents.lr @@ -7,7 +7,9 @@ _hidden: yes seo_slug: tor-derived-names --- description: -Tor enjoys a vibrant [research community](https://research.torproject.org/) that examines anonymity attacks and defenses, design improvements, impact on society, and so on. We think it's great that professors and other researchers continue to contribute to our community, and we've even gotten funding from the National Science Foundation to help keep the Tor design and code researcher-friendly. The [anonymity bibliography](http://freehaven.net/anonbib/) lists many research papers that use Tor-derived names in their titles: Torsk, DefenestraTor, Tortoise, LASTor, Torchestra, StegoTorus, and more. +Tor enjoys a vibrant [research community](https://research.torproject.org/) that examines anonymity attacks and defenses, design improvements, impact on society, and so on. +We think it's great that professors and other researchers continue to contribute to our community, and we've even gotten funding from the National Science Foundation to help keep the Tor design and code researcher-friendly. +The [anonymity bibliography](http://freehaven.net/anonbib/) lists many research papers that use Tor-derived names in their titles: Torsk, DefenestraTor, Tortoise, LASTor, Torchestra, StegoTorus, and more. Since the authors of these research papers aren't trying to make a profit from them, and (because they're just papers, not products) the papers aren't confusing Tor users into running potentially unsafe software, we believe that the use of the Tor mark in these research paper titles is acceptable non-trademark or fair use. diff --git a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr index e621368..061c6be 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-5/contents.lr @@ -7,7 +7,13 @@ _hidden: yes seo_slug: enforcing-trademark-rights --- description: -The Tor Project is a non-profit corporation organized to research and develop the Tor anonymity software and network. We don't want to be trademark bullies, but we will use trademark to protect the public's ability to recognize Tor Project software. Trademark law helps us to assure that the name is used only in connection with genuine Tor anonymity software and for accurate description of software and services. After all, to protect their anonymity securely, computer users must be able to identify the software they are using, so they can account properly for its strengths and weaknesses. Tor has become well-known as a software package and associated network of onion-routing anonymizing proxies, with online documentation, instructions for strengthening anonymity protection, and warnings that even at this stage it remains experimental software. We work with developers to improve the software and network and actively encourage researchers to document attacks to help us strengthen its a nonymity protection further. We distribute the software itself freely, but require correct attribution. +The Tor Project is a non-profit corporation organized to research and develop the Tor anonymity software and network. +We don't want to be trademark bullies, but we will use trademark to protect the public's ability to recognize Tor Project software. +Trademark law helps us to assure that the name is used only in connection with genuine Tor anonymity software and for accurate description of software and services. +After all, to protect their anonymity securely, computer users must be able to identify the software they are using, so they can account properly for its strengths and weaknesses. +Tor has become well-known as a software package and associated network of onion-routing anonymizing proxies, with online documentation, instructions for strengthening anonymity protection, and warnings that even at this stage it remains experimental software. +We work with developers to improve the software and network and actively encourage researchers to document attacks to help us strengthen its anonymity protection further. +We distribute the software itself freely, but require correct attribution. We hold two trademarks in the United States:

1 0

[tpo/staging] Add link to Contact page in `trademark-faq-6`
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 573b4026f0bc4f669029af5f0b35c7bf0f51e11c Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Wed Sep 4 15:01:13 2019 -0400 Add link to Contact page in `trademark-faq-6` --- content/about/trademark/trademark-faq/trademark-faq-6/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr index 2335d60..32dd43e 100644 --- a/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr +++ b/content/about/trademark/trademark-faq/trademark-faq-6/contents.lr @@ -5,4 +5,4 @@ title: What if I produce non-open source, commercial products based on Tor? seo_slug: commercial-tor-derivatives --- description: -Contact us, and let's talk. +[Contact us](/contact), and let's talk.

1 0

[tpo/staging] In contact section add #tor-ux channel
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 6fd9b34039c1904f5a7685879fa9d7744b0e287a Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Thu Sep 5 21:23:59 2019 +0530 In contact section add #tor-ux channel Fixes https://dip.torproject.org/web/tpo/issues/36 Updated to remove 'translations' also from #tor-project. --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index dec2d49..71af4bd 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -10,7 +10,7 @@ <p class="text-tpo"><span class="text-primary nick">#tor-dev</span> - {{ _("Discuss Tor-related coding and protocols. Ideas are welcome.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-l10n</span> - {{ _("Get in touch with other translators") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-meeting</span> - {{ _("Watch or join publicly logged team meetings.") }}</p> - <p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, and translation.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups and outreach.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-relays</span> - {{ _("Discuss running a Tor relay.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-south</span> - {{ _("Talk with Tor's global south community.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-www</span> - {{ _("Talk with us about improvements on our websites.") }}</p>

1 0

[tpo/staging] Update symlinks and add metatag
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit c7c29ac05b9d7fd08b8203e76eb417688983217a Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 16:38:28 2019 +0200 Update symlinks and add metatag --- assets/javascript | 2 +- assets/scss | 2 +- assets/static/css | 2 +- assets/static/fonts | 2 +- assets/static/js | 2 +- lego | 2 +- templates/meta.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/javascript b/assets/javascript index c8db05e..f1da3c5 120000 --- a/assets/javascript +++ b/assets/javascript @@ -1 +1 @@ -../lego/assests/javascript \ No newline at end of file +../lego/assets/javascript \ No newline at end of file diff --git a/assets/scss b/assets/scss index b77f409..2d8ed2e 120000 --- a/assets/scss +++ b/assets/scss @@ -1 +1 @@ -../lego/assests/scss \ No newline at end of file +../lego/assets/scss \ No newline at end of file diff --git a/assets/static/css b/assets/static/css index 0db4948..12e4567 120000 --- a/assets/static/css +++ b/assets/static/css @@ -1 +1 @@ -../../lego/assests/static/css \ No newline at end of file +../../lego/assets/static/css \ No newline at end of file diff --git a/assets/static/fonts b/assets/static/fonts index 2da38c7..25deee7 120000 --- a/assets/static/fonts +++ b/assets/static/fonts @@ -1 +1 @@ -../../lego/assests/static/fonts \ No newline at end of file +../../lego/assets/static/fonts \ No newline at end of file diff --git a/assets/static/js b/assets/static/js index 7b741e3..361859a 120000 --- a/assets/static/js +++ b/assets/static/js @@ -1 +1 @@ -../../lego/assests/static/js \ No newline at end of file +../../lego/assets/static/js \ No newline at end of file diff --git a/lego b/lego index aa31aec..3d80025 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit aa31aec9ca27d2037e7a3befb6a6e3aa1aed8f17 +Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763 diff --git a/templates/meta.html b/templates/meta.html index 325d57a..8601988 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> -<meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}"> +<meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" />

1 0

[tpo/staging] update volunteer contact link
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit de183aa009787660793cc8e6e15a1cb0b85c10fc Author: Antonela <hola(a)antonela.me> Date: Thu Sep 5 21:34:10 2019 -0400 update volunteer contact link close https://dip.torproject.org/web/tpo/issues/29 --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index 71af4bd..bd87b90 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -38,7 +38,7 @@ </div> <div class="row bg-dark justify-content-center p-3"> <h4 class="text-white display-5"> - <a class="text-white" href="https://2019.www.torproject.org/getinvolved/volunteer" target="_blank" title="{{ _('Get Involved') }}"><u>{{ _('Get Involved') }}</u></a> + <a class="text-white" href="https://community.torproject.org/" target="_blank" title="{{ _('Get Involved') }}"><u>{{ _('Get Involved') }}</u></a> </h4> </div> </div>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2019