fix urls and whitespace

svn:r14621

1 files changed, 16 insertions, 15 deletions

diff --git a/contrib/tor-exit-notice.html b/contrib/tor-exit-notice.html
index a59bb0bd3..90b53b5d5 100644
--- a/contrib/tor-exit-notice.html
+++ b/contrib/tor-exit-notice.html
@@ -4,17 +4,17 @@
 
 <!--
 
-This notice is intended to be placed on a virtual host for a domain that 
+This notice is intended to be placed on a virtual host for a domain that
 your Tor exit node IP reverse resolves to so that people who may be about
-to file an abuse complaint would check it first before bothering you or 
+to file an abuse complaint would check it first before bothering you or
 your ISP. Ex:
 http://tor-exit.yourdomain.org or http://tor-readme.yourdomain.org.
 
-This type of setup has proven very effective at reducing abuse complaints 
+This type of setup has proven very effective at reducing abuse complaints
 for exit node operators.
 
 There are a few places in this document that you may want to customize.
-They are marked with FIXME. 
+They are marked with FIXME.
 
 -->
 
@@ -25,7 +25,7 @@ They are marked with FIXME.
 
 <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="http://tor.eff.org/index.html">Tor Anonymous Network</a>, which is
+href="https://www.torproject.org/">Tor Anonymous Network</a>, which is
 dedicated to providing people with anonymity who need it most: average
 computer users. This router IP should be generating no other traffic, unless
 it has been compromised.
@@ -42,9 +42,9 @@ stalker targets, the US military, and law enforcement, just to name a few.
 
 <p>
 
-<!-- FIXME: you should probably grab your own copy of tor-route.png 
+<!-- FIXME: you should probably grab your own copy of tor-route.png
 and serve it locally -->
-<center><a href="http://tor.eff.org/overview.html.en">
+<center><a href="https://www.torproject.org/overview.html.en">
 <img src="http://tor-exit.fscked.org/tor-route.png"></a></center>
 
 <p>
@@ -79,7 +79,7 @@ machine.
 
 <p>
 
-<!-- FIXME: May or may not be US-only. Some non-US tor nodes have in 
+<!-- FIXME: May or may not be US-only. Some non-US tor nodes have in
 fact reported DMCA harassment... -->
 
 If you are a representative of a company who feels that this router is being
@@ -90,15 +90,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="http://tor.eff.org/eff/tor-dmca-response.html">EFF's prepared
+<a href="https://www.torproject.org/eff/tor-dmca-response.html">EFF's prepared
 response</a> for more information on this matter.
 
 <p>For more information, please consult the following documentation:
 
 <ol>
-<li><a href="http://tor.eff.org/overview.html">Tor Overview</a></li>
-<li><a href="http://tor.eff.org/faq-abuse.html">Tor Abuse FAQ</a></li>
-<li><a href="http://tor.eff.org//eff/tor-legal-faq.html">Tor Legal FAQ</a></li>
+<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>
 </ol>
 <p>
 
@@ -112,12 +112,13 @@ already blocked.
 
 <p>You also have the option of blocking this IP and others on the Tor network
 if you so desire. The Tor project provides a <a
-href="http://tor.eff.org/cvs/tor/contrib/exitlist">python script</a> to
+href="https://www.torproject.org/cvs/tor/contrib/exitlist">python script</a> to
 extract all IP addresses of Tor exit nodes, and an official <a
-href="http://exitlist.torproject.org">DNSRBL</a> is also available to
+href="http://exitlist.torproject.org/">DNSRBL</a> is also available to
 determine if a given IP is actually a Tor exit server. Please be considerate
 when using these options. It would be unfortunate to deny all Tor users access
-to your site indefinitely simply because of a few bad apples. 
+to your site indefinitely simply because of a few bad apples.
 
 </body>
 </html>
+