GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 4d7d4493 authored by RotationMatrix's avatar RotationMatrix Committed by Hiro

Modify link in `trademark-faq-4`

Now it links to the "Can I use the word "Tor"" question on the new page.
parent 5c20a565
......@@ -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).
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment