diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-01-26 11:18:32 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-01-26 11:18:32 -0500 |
commit | c417210ff3f52a2b0f8783fee807db95d4fe8d93 (patch) | |
tree | fbd6a6da34fad041a9b056d14a28525d409d9369 /contrib | |
parent | a880429a7657634c690191c3abae0531ed6e89e1 (diff) | |
parent | 58dfebbcb41b4b13b7aad3cccf85c85e4c6bc2c6 (diff) | |
download | tor-c417210ff3f52a2b0f8783fee807db95d4fe8d93.tar tor-c417210ff3f52a2b0f8783fee807db95d4fe8d93.tar.gz |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/tor-exit-notice.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/tor-exit-notice.html b/contrib/tor-exit-notice.html index 8b37edc3f..de3be1744 100644 --- a/contrib/tor-exit-notice.html +++ b/contrib/tor-exit-notice.html @@ -32,7 +32,7 @@ Tor Exit Router</p> Most likely you are accessing this website because you had some issue with the traffic coming from this IP. This router is part of the <a href="https://www.torproject.org/">Tor Anonymity Network</a>, which is -dedicated to <a href="https://www.torproject.org/overview.html">providing +dedicated to <a href="https://www.torproject.org/about/overview">providing privacy</a> to people who need it most: average computer users. This router IP should be generating no other traffic, unless it has been compromised.</p> @@ -42,19 +42,19 @@ compromised.</p> and serve it locally --> <p style="text-align:center"> -<a href="https://www.torproject.org/overview.html"> +<a href="https://www.torproject.org/about/overview"> <img src="https://www.torproject.org/images/how_tor_works_thumb.png" alt="How Tor works" style="border-style:none"/> </a></p> <p> -Tor sees use by <a href="https://www.torproject.org/torusers.html">many +Tor sees use by <a href="https://www.torproject.org/about/torusers">many important segments of the population</a>, including whistle blowers, journalists, Chinese dissidents skirting the Great Firewall and oppressive censorship, abuse victims, stalker targets, the US military, and law enforcement, just to name a few. While Tor is not designed for malicious computer users, it is true that they can use the network for malicious ends. In reality however, the actual amount of <a -href="https://www.torproject.org/faq-abuse.html">abuse</a> is quite low. This +href="https://www.torproject.org/docs/faq-abuse">abuse</a> is quite low. This is largely because criminals and hackers have significantly better access to privacy and anonymity than do the regular users whom they prey upon. Criminals can and do <a @@ -108,15 +108,15 @@ equipment, in accordance with <a href="http://www4.law.cornell.edu/uscode/html/uscode17/usc_sec_17_00000512----000-.html">DMCA "safe harbor" provisions</a>. In other words, you will have just as much luck sending a takedown notice to the Internet backbone providers. Please consult -<a href="https://www.torproject.org/eff/tor-dmca-response.html">EFF's prepared +<a href="https://www.torproject.org/eff/tor-dmca-response">EFF's prepared response</a> for more information on this matter.</p> <p>For more information, please consult the following documentation:</p> <ol> -<li><a href="https://www.torproject.org/overview.html">Tor Overview</a></li> -<li><a href="https://www.torproject.org/faq-abuse.html">Tor Abuse FAQ</a></li> -<li><a href="https://www.torproject.org/eff/tor-legal-faq.html">Tor Legal FAQ</a></li> +<li><a href="https://www.torproject.org/about/overview">Tor Overview</a></li> +<li><a href="https://www.torproject.org/docs/faq-abuse">Tor Abuse FAQ</a></li> +<li><a href="https://www.torproject.org/eff/tor-legal-faq">Tor Legal FAQ</a></li> </ol> <p> @@ -134,7 +134,7 @@ the Tor network if you so desire. The Tor project provides a <a href="https://check.torproject.org/cgi-bin/TorBulkExitList.py">web service</a> to fetch a list of all IP addresses of Tor exit nodes that allow exiting to a specified IP:port combination, and an official <a -href="https://www.torproject.org/tordnsel/">DNSRBL</a> is also available to +href="https://www.torproject.org/tordnsel/dist/">DNSRBL</a> is also available to determine if a given IP address is actually a Tor exit server. Please be considerate when using these options. It would be unfortunate to deny all Tor users access |