[tor-commits] [tpo/master] Modify link in `trademark-faq-4`

hiro at torproject.org hiro at torproject.org
Thu Sep 5 13:24:02 UTC 2019


commit 4d7d44939c1281e9feaa46c4b85a6b6ab88ad2ba
Author: RotationMatrix <52428419+RotationMatrix at 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#combining).
+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).





More information about the tor-commits mailing list