[or-cvs] [tor/release-0.2.2] Backport current tor-exit-notice to 0.2.1

Sat Feb 12 10:03:03 UTC 2011

commit ebb287c75dc02689a6552ef1d5dc1358624b34dd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 26 11:13:57 2011 -0500

    Backport current tor-exit-notice to 0.2.1
---
 contrib/tor-exit-notice.html |   72 ++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/contrib/tor-exit-notice.html b/contrib/tor-exit-notice.html
index 4ab028f..8b37edc 100644
--- a/contrib/tor-exit-notice.html
+++ b/contrib/tor-exit-notice.html
@@ -1,5 +1,9 @@
-<html>
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>This is a Tor Exit Router</title>
 
 <!--
@@ -19,29 +23,31 @@ They are marked with FIXME.
 -->
 
 </head>
-<body bgcolor=white text=black>
+<body>
 
-<center><h1>This is a Tor Exit Router</h1></center>
+<p style="text-align:center; font-size:xx-large; font-weight:bold">This is a
+Tor Exit Router</p>
 
-<p>Most likely you are accessing this website because you had some issue with
+<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/30seconds.html.en">providing
+dedicated to <a href="https://www.torproject.org/overview.html">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>
+compromised.</p>
 
 
 <!-- FIXME: you should probably grab your own copy of how_tor_works_thumb.png
-and serve it locally -->
-<center><a href="https://www.torproject.org/overview.html">
-<img src="https://www.torproject.org/images/how_tor_works_thumb.png"></a></center>
+     and serve it locally -->
 
-<p>
+<p style="text-align:center">
+<a href="https://www.torproject.org/overview.html">
+<img src="https://www.torproject.org/images/how_tor_works_thumb.png" alt="How Tor works" style="border-style:none"/>
+</a></p>
 
-Tor sees use by <a href="https://www.torproject.org/torusers.html.en">many
+<p>
+Tor sees use by <a href="https://www.torproject.org/torusers.html">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
@@ -59,44 +65,41 @@ powerful networks</a> than Tor on a daily basis. Thus, in the mind of this
 operator, the social need for easily accessible censorship-resistant private,
 anonymous communication trumps the risk of unskilled bad actors, who are
 almost always more easily uncovered by traditional police work than by
-extensive monitoring and surveillance anyway.
+extensive monitoring and surveillance anyway.</p>
 
 <p>
-
 In terms of applicable law, the best way to understand Tor is to consider it a
 network of routers operating as common carriers, much like the Internet
 backbone. However, unlike the Internet backbone routers, Tor routers
 explicitly do not contain identifiable routing information about the source of
 a packet, and no single Tor node can determine both the origin and destination
-of a given transmission.
+of a given transmission.</p>
 
 <p>
-
 As such, there is little the operator of this router can do to help you track
 the connection further. This router maintains no logs of any of the Tor
 traffic, so there is little that can be done to trace either legitimate or
 illegitimate traffic (or to filter one from the other).  Attempts to
-seize this router will accomplish nothing.
-<p>
+seize this router will accomplish nothing.</p>
 
-<!--- FIXME: US-Only section. Remove if you are a non-US operator -->
+<!-- FIXME: US-Only section. Remove if you are a non-US operator -->
 
+<p>
 Furthermore, this machine also serves as a carrier of email, which means that
 its contents are further protected under the ECPA. <a
 href="http://www4.law.cornell.edu/uscode/html/uscode18/usc_sec_18_00002707----000-.html">18
 USC 2707</a> explicitly allows for civil remedies ($1000/account
-<i><b><u>plus</u></b></i>  legal fees)
+<i><b>plus</b></i>  legal fees)
 in the event of a seizure executed without good faith or probable cause (it
 should be clear at this point that traffic with an originating IP address of
 FIXME_DNS_NAME should not constitute probable cause to seize the
 machine). Similar considerations exist for 1st amendment content on this
-machine.
-
-<p>
+machine.</p>
 
 <!-- FIXME: May or may not be US-only. Some non-US tor nodes have in
-fact reported DMCA harassment... -->
+     fact reported DMCA harassment... -->
 
+<p>
 If you are a representative of a company who feels that this router is being
 used to violate the DMCA, please be aware that this machine does not host or
 contain any illegal content. Also be aware that network infrastructure
@@ -106,35 +109,36 @@ href="http://www4.law.cornell.edu/uscode/html/uscode17/usc_sec_17_00000512----00
 "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
-response</a> for more information on this matter.
+response</a> for more information on this matter.</p>
 
-<p>For more information, please consult the following documentation:
+<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>
 </ol>
-<p>
 
+<p>
 That being said, if you still have a complaint about the router,  you may
 email the <a href="mailto:FIXME_YOUR_EMAIL_ADDRESS">maintainer</a>. If
 complaints are related to a particular service that is being abused, I will
 consider removing that service from my exit policy, which would prevent my
 router from allowing that traffic to exit through it. I can only do this on an
 IP+destination port basis, however. Common P2P ports are
-already blocked.
+already blocked.</p>
 
-<p>You also have the option of blocking this IP address and others on
+<p>
+You also have the option of blocking this IP address and others on
 the Tor network if you so desire. The Tor project provides a <a
-href="https://tor-svn.freehaven.net/svn/tor/trunk/contrib/exitlist">python script</a> to
-extract all IP addresses of Tor exit nodes, and an official <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
 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
-to your site indefinitely simply because of a few bad apples.
+to your site indefinitely simply because of a few bad apples.</p>
 
 </body>
 </html>
-



