more options for how to get a tshirt (32689ba9b) - tor-webwml.git

tshirt.html

@@ -1,12 +1,41 @@
 <html>
 <head>
-<title>EFF Tor T-shirt</title>
+<title>Tor T-shirt</title>
 </head>
 <body>
 
-<p>You can get one of these fine Tor t-shirts either through the
-<a href="gui/">GUI competition</a> or through a <a
-href="donate">tax-deductible donation</a> to Tor via EFF.
+<p>You can get one of these fine Tor T-shirts for contributing to the
+Tor project. There are three primary ways of contributing:</p>
+
+<ul>
+<li>A <a href="donate">tax-deductible donation</a> to Tor via EFF.</li>
+<li>Operate a fast <a href="docs/tor-doc-server">Tor server</a> that's
+been running for the past two months: you are eligible if you allow
+exits to port 80 and you average 100 KB/s traffic, or if you're not an
+exit but you average 500 KB/s traffic.</li>
+<li>Help out in other ways. <a href="translation">Maintain
+a translation for the website</a>. Write a good <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/SupportPrograms">support
+program and get a lot of people to use it</a>. Do research on Tor
+and anonymity, solve some of our bugs, or establish yourself as a Tor
+advocate.
+</li>
+</ul>
+
+<p>
+If you're <a href="donate">donating via EFF</a>, there's no need to
+email us &mdash; just provide your details when you donate. Otherwise,
+mail tor-tshirt at freehaven dot net with a brief explanation. Be sure
+to specify a size (S/M/L/XL/XXL), a backup size if your first choice
+isn't available, and a shipping address.
+</p>
+
+<p>
+Please take a look at the striking conversation-starting bright green
+color below: we only have a limited number of shirts, so make sure
+you'll actually put yours to good use. You can also see the shirts
+<a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorShirt">in
+action</a> &mdash; add your own photos there too.
 </p>
 
 <div style="text-align: center">


...	...	@@ -1,12 +1,41 @@
1	1	<html>
2	2	<head>
3		-<title>EFF Tor T-shirt</title>
	3	+<title>Tor T-shirt</title>
4	4	</head>
5	5	<body>
6	6
7		-<p>You can get one of these fine Tor t-shirts either through the
8		-<a href="gui/">GUI competition</a> or through a <a
9		-href="donate">tax-deductible donation</a> to Tor via EFF.
	7	+<p>You can get one of these fine Tor T-shirts for contributing to the
	8	+Tor project. There are three primary ways of contributing:</p>
	9	+
	10	+<ul>
	11	+<li>A <a href="donate">tax-deductible donation</a> to Tor via EFF.</li>
	12	+<li>Operate a fast <a href="docs/tor-doc-server">Tor server</a> that's
	13	+been running for the past two months: you are eligible if you allow
	14	+exits to port 80 and you average 100 KB/s traffic, or if you're not an
	15	+exit but you average 500 KB/s traffic.</li>
	16	+<li>Help out in other ways. <a href="translation">Maintain
	17	+a translation for the website</a>. Write a good <a
	18	+href="http://wiki.noreply.org/noreply/TheOnionRouter/SupportPrograms">support
	19	+program and get a lot of people to use it</a>. Do research on Tor
	20	+and anonymity, solve some of our bugs, or establish yourself as a Tor
	21	+advocate.
	22	+</li>
	23	+</ul>
	24	+
	25	+<p>
	26	+If you're <a href="donate">donating via EFF</a>, there's no need to
	27	+email us — just provide your details when you donate. Otherwise,
	28	+mail tor-tshirt at freehaven dot net with a brief explanation. Be sure
	29	+to specify a size (S/M/L/XL/XXL), a backup size if your first choice
	30	+isn't available, and a shipping address.
	31	+</p>
	32	+
	33	+<p>
	34	+Please take a look at the striking conversation-starting bright green
	35	+color below: we only have a limited number of shirts, so make sure
	36	+you'll actually put yours to good use. You can also see the shirts
	37	+<a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorShirt">in
	38	+action</a> — add your own photos there too.
10	39	</p>
11	40
12	41	<div style="text-align: center">
13	42