Browse code

Merge branch 'master' into staging

Sebastian Hahn authored on24/07/2015 03:11:00
Showing4 changed files
... ...
@@ -30,6 +30,7 @@
30 30
 	  <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2016)</li>
31 31
 	  <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li>
32 32
 	  <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2017)</li>
33
+	  <li><a href="http://www.auswaertiges-amt.de/">Federal Foreign Office of Germany</a> (2015)</li>
33 34
 	  <li><a href="https://digitaldefenders.org/">Hivos/The Digital Defenders Partnership</a> (2014-2015)</li>
34 35
 	  <li><a href="http://www.sri.com/">SRI International</a> (2011-2015)</li>
35 36
 	  <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2016)</li>
... ...
@@ -151,6 +151,15 @@
151 151
       </div>
152 152
       <!-- END MAINCOL -->
153 153
       <div id="sidecol">
154
+      <div id="helpus">
155
+          <h2>A Call for Help</h2>
156
+      <div class="fauxhead"></div>
157
+          <div class="user">
158
+            <h3>
159
+              <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Tor needs a new Executive Directory</a>
160
+            </h3>
161
+          </div>
162
+      </div>
154 163
       <!-- BLOG WIDGET -->
155 164
 #include <blog-recent.wmi>
156 165
       <!-- END BLOG WIDGET -->
... ...
@@ -37,30 +37,41 @@
37 37
     The <a href="https://weather.torproject.org/">Tor Weather</a>
38 38
     system watches all of the relays. If you have a valid email address
39 39
     (lightly obfuscated is acceptable) in your ContactInfo field,
40
-    we'll automatically email you when your relay earns you a free
41
-    t-shirt.
40
+    we'll automatically email you when your relay earns you a t-shirt.
42 41
     </p>
43 42
 
44 43
     <p>
45
-    If you get such a mail, or you've done something else cool,
46
-    email us at tshirt@torproject.org with the details. There's no need
47
-    to include a mailing address yet, you'll receive a link where you
48
-    can enter your shipping information.
44
+    If you get such a mail, or you've done something else cool, email
45
+    us at tshirt@torproject.org with the details. (We want to make sure
46
+    our shirts help outreach happen all around the world, so please
47
+    understand if we can't send you 5 shirts for your 5 excellent relays.)
49 48
     </p>
50 49
 
51 50
     <p>
52
-    You can choose between the traditional black and our conversation-starting
53
-    bright green. You can also see the shirts
54
-    <a href="<wiki>doc/TorShirt">in
55
-    action</a> &mdash; add your own photos there too.
51
+    The nice people at torservers.net
52
+    are handling the tshirt requests. They have <a
53
+    href="https://www.torservers.net/wiki/ttshirt/index">a variety of
54
+    colors, shapes, and sizes</a>, using the great new "roots" design
55
+    that Leiah Jansen made for us.
56 56
     </p>
57 57
 
58 58
     <div style="text-align: center">
59
-    <a href="$(IMGROOT)/black-tor-tshirt.png"><img
60
-    src="$(IMGROOT)/black-tor-tshirt.png"></a>
61
-    <a href="$(IMGROOT)/green-tor-tshirt.png"><img
62
-    src="$(IMGROOT)/green-tor-tshirt.png"></a>
59
+    <a href="$(IMGROOT)/torshirtsob.jpg"><img
60
+    src="$(IMGROOT)/torshirtsob.jpg"></a>
63 61
     </div>
62
+
63
+    <p>
64
+    In the past, you could choose between the traditional <a
65
+    href="$(IMGROOT)/black-tor-tshirt.png">black</a> and our <a
66
+    href="$(IMGROOT)/green-tor-tshirt.png">conversation-starting bright
67
+    green</a>. We'll bring those shirts back one day too.
68
+    </p>
69
+
70
+    <p>
71
+    You can see the shirts <a href="<wiki>doc/TorShirt">in
72
+    action</a> &mdash; add your own photos there too.
73
+    </p>
74
+
64 75
   </div>
65 76
   <!-- END MAINCOL -->
66 77
   <div id = "sidecol">
... ...
@@ -71,3 +82,4 @@
71 82
 </div>
72 83
 <!-- END CONTENT -->
73 84
 #include <foot.wmi>
85
+
74 86
new file mode 100644
75 87
Binary files /dev/null and b/images/torshirtsob.jpg differ