Browse code

get some work done on the new website.

Andrew Lewman authored on01/08/2010 19:37:01
Showing7 changed files
... ...
@@ -2,7 +2,8 @@
2 2
 # Revision: $Revision: 0 $
3 3
 # Translation-Priority: 3-low
4 4
 
5
-#include "head.wmi" TITLE="Tor Project: Tor Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
+#include "head.wmi" TITLE="Tor Project: Tor Overview" CHARSET="UTF-8"
6
+ANNOUNCE_RSS="yes"
6 7
 <div id="content" class="clearfix">
7 8
   <div id="breadcrumbs">
8 9
     <a href="<page home>">Home &raquo; </a>
... ...
@@ -10,12 +11,42 @@
10 11
   </div>
11 12
   <div id="maincol">
12 13
     <h1>Tor Overview</h1>
13
-    <p>Tor is a network of virtual tunnels that allows people and groups to improve their privacy and security on the Internet. It also enables software developers to create new communication tools with built-in privacy features. Tor provides the foundation for a range of applications that allow organizations and individuals to share information over public networks without compromising their privacy.</p>
14
-    <p>Individuals use Tor to keep websites from tracking them and their family members, or to connect to news sites, instant messaging services, and the like when these are blocked by their local Internet providers. Tor's <a href="#">hidden services</a> let users publish web sites and other services without needing to reveal the location of the site. Individuals also use Tor for socially sensitive communication: chat rooms and web forums for rape and abuse survivors, or people with illnesses.</p>
15
-    <p>Journalists use Tor to communicate more safely with whistleblowers and dissidents. Non-governmental organizations (NGOs) use Tor to allow their workers to connect to their home website while they're in a foreign country, without notifying everybody nearby that they're working with that organization.</p>
16
-    <p>Groups such as Indymedia recommend Tor for safeguarding their members' online privacy and security. Activist groups like the <a href="http://www.eff.org/">Electronic Frontier Foundation</a> (EFF) recommend Tor as a mechanism for maintaining civil liberties online. Corporations use Tor as a safe way to conduct competitive analysis, and to protect sensitive procurement patterns from eavesdroppers. They also use it to replace traditional VPNs, which reveal the exact amount and timing of communication. Which locations have employees working late? Which locations have employees consulting job-hunting websites? Which research divisions are communicating with the company's patent lawyers?</p>
17
-    <p>A branch of the U.S. Navy uses Tor for open source intelligence gathering, and one of its teams used Tor while deployed in the Middle East recently. Law enforcement uses Tor for visiting or surveilling web sites without leaving government IP addresses in their web logs, and for security during sting operations.</p>
18
-    <p>The <a href="<page about/corepeople>">variety of people</a> who use Tor is actually part of <a href="<page about/overview>">what makes it so secure</a>. Tor hides you among the other users on the network, so the more populous and diverse the user base for Tor is, the more your anonymity will be protected.</p>
14
+    <p>Tor is a network of virtual tunnels that allows people and groups to
15
+improve their privacy and security on the Internet. It also enables software
16
+developers to create new communication tools with built-in privacy features. Tor
17
+provides the foundation for a range of applications that allow organizations and
18
+individuals to share information over public networks without compromising their
19
+privacy.</p>
20
+    <p>Individuals use Tor to keep websites from tracking them and their family
21
+members, or to connect to news sites, instant messaging services, and the like
22
+when these are blocked by their local Internet providers. Tor's <a
23
+href="<page docs/hidden-services>">hidden services</a> let users publish web sites and other services
24
+without needing to reveal the location of the site. Individuals also use Tor for
25
+socially sensitive communication: chat rooms and web forums for rape and abuse
26
+survivors, or people with illnesses.</p>
27
+    <p>Journalists use Tor to communicate more safely with whistleblowers and
28
+dissidents. Non-governmental organizations (NGOs) use Tor to allow their workers
29
+to connect to their home website while they're in a foreign country, without
30
+notifying everybody nearby that they're working with that organization.</p>
31
+    <p>Groups such as Indymedia recommend Tor for safeguarding their members'
32
+online privacy and security. Activist groups like the <a
33
+href="http://www.eff.org/">Electronic Frontier Foundation</a> (EFF) recommend
34
+Tor as a mechanism for maintaining civil liberties online. Corporations use Tor
35
+as a safe way to conduct competitive analysis, and to protect sensitive
36
+procurement patterns from eavesdroppers. They also use it to replace traditional
37
+VPNs, which reveal the exact amount and timing of communication. Which locations
38
+have employees working late? Which locations have employees consulting
39
+job-hunting websites? Which research divisions are communicating with the
40
+company's patent lawyers?</p>
41
+    <p>A branch of the U.S. Navy uses Tor for open source intelligence
42
+gathering, and one of its teams used Tor while deployed in the Middle East
43
+recently. Law enforcement uses Tor for visiting or surveilling web sites without
44
+leaving government IP addresses in their web logs, and for security during sting
45
+operations.</p>
46
+    <p>The <a href="<page about/corepeople>">variety of people</a> who use Tor
47
+is actually part of <a href="<page about/overview>">what makes it so secure</a>.
48
+Tor hides you among the other users on the network, so the more populous and
49
+diverse the user base for Tor is, the more your anonymity will be protected.</p>
19 50
   </div>
20 51
   <!-- END MAINCOL -->
21 52
   <div id = "sidecol">
... ...
@@ -14,50 +14,50 @@
14 14
     <table>
15 15
     	<tr>
16 16
         <td class="beige">
17
-          <div class="name">Board Member Name</div>
18
-          <div class="caps">Board Member Title</div>
19
-          <p>Board Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
20
-        </td>
21
-        <td>
22
-          <div class="name">Board Member Name</div>
23
-          <div class="caps">Board Member Title</div>
24
-          <p>Board Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
17
+	  <div class="name">Roger Dingledine</div>
18
+	  <div class="caps">President and Director</div>
19
+	    <p>Original developer of Tor along with Nick Mathewson and Paul Syverson. Leading researcher in the anonymous communications field.  Frequent speaker at conferences to advocate Tor, explain what Tor is and can do, and helps coordinate academic researchers.</p>
20
+	</td>
21
+	<td>
22
+          <div class="name">Meredith Hoban-Dunn</div>
23
+	  <div class="caps">Audit Committee Chair</div>
24
+           <p>Meredith is an accomplished accountant, advisor, and banker.  Her role is to help us make sure we're able to pass our upcoming corporate audits correctly, watch for internal fraud, tell us when we're doing things in a non-standard way, and so on.</p>
25 25
         </td>
26 26
       </tr>
27 27
       <tr>
28 28
         <td>
29
-          <div class="name">Board Member Name</div>
30
-          <div class="caps">Board Member Title</div>
31
-          <p>Board Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
29
+          <div class="name">Ian Goldberg</div>
30
+	  <div class="caps">Chairman of the Board</div>
31
+          <p>Cryptographer, privacy expert, and professor; one of the designers of <a href="http://www.cypherpunks.ca/otr/">Off-the-Record Messaging</a>.</p>
32 32
         </td>
33
-        <td class="beige">
34
-          <div class="name">Board Member Name</div>
35
-          <div class="caps">Board Member Title</div>
36
-          <p>Board Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
33
+	<td class="beige">
34
+	  <div class="name">Andrew Lewman</div>
35
+	  <div class="caps">Secretary, Treasurer, and Executive Director</div>
36
+	  <p>Andrew is the Executive Director reponsible for all operations of The Tor Project, Inc.  His current activities can be found at <a href="http://lewman.com">his website</a>.</p>
37
+	</td>
38
+    </tr>
39
+    <tr>
40
+	<td class="beige">
41
+	  <div class="name">Nick Mathewson</div>
42
+	  <div class="caps">Vice-President and Director</div>
43
+	  <p>Nick is one of the original developers of Tor.  He's the Chief Architect of The Tor Project, Inc.</p>
44
+	 </td>
45
+	 <td>
46
+          <div class="name">Xianghui (Isaac) Mao </div>
47
+	  <div class="caps">Director</div>
48
+           <p>Chinese blogging and privacy activist.  His current activities can be found at <a href="http://isaacmao.com/">his website</a>.</p>
37 49
         </td>
38 50
       </tr>
39 51
       <tr>
40
-        <td class="beige">
41
-          <div class="name">Board Member Name</div>
42
-          <div class="caps">Board Member Title</div>
43
-          <p>Board Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
44
-        </td>
45
-        <td>
46
-          <div class="name">Board Member Name</div>
47
-          <div class="caps">Board Member Title</div>
48
-          <p>Board Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
49
-        </td>
50
-      </tr>
51
-      <tr>
52
-        <td>
53
-          <div class="name">Board Member Name</div>
54
-          <div class="caps">Board Member Title</div>
55
-          <p>Board Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
52
+	<td>
53
+          <div class="name">Frank Rieger</div>
54
+	  <div class="caps">Director</div>
55
+           <p>CTO of <a href="http://www.gsmk.de/">GSMK Cryptophone</a>.</p>
56 56
         </td>
57 57
         <td class="beige">
58
-          <div class="name">Board Member Name</div>
59
-          <div class="caps">Board Member Title</div>
60
-          <p>Board Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
58
+          <div class="name">Wendy Seltzer</div>
59
+	  <div class="caps">Director</div>
60
+           <p>Lawyer, cyberlaw professor, and founder of <a href="http://chillingeffects.org/">ChillingEffects.org</a>.</p>
61 61
         </td>
62 62
       </tr>
63 63
     </table>
... ...
@@ -71,5 +71,5 @@
71 71
   <!-- END SIDECOL -->
72 72
 </div>
73 73
 <!-- END CONTENT -->
74
-#include <foot.wmi> 
75
- 
74
+#include <foot.wmi>
75
+
... ...
@@ -12,11 +12,11 @@
12 12
   </div>
13 13
   <div id="maincol">
14 14
     <h2>Tor: Contact</h2>
15
-    
15
+
16 16
     <p>First, if you have a problem or question about using Tor, go look at the <a href="<page docs/documentation>#Support">Support section</a> for how to proceed. The Tor developers spend most of their time developing Tor, and there are no people devoted to user support, so try to help yourself before <a href="<page docs/faq>#SupportMail">politely trying to find a volunteer</a>.</p>
17
-    
17
+
18 18
     <p>If you really do need to reach us, here are some approaches. All of these addresses are @torproject.org. Note that in practice most of them go to the same small group of people, so please be patient and <a href="http://www.catb.org/~esr/faqs/smart-questions.html">helpful</a>, and please make sure to write your mail in English.</p>
19
-    
19
+
20 20
     <ul>
21 21
       <li><tt>tor-assistants</tt> is the catch-all address for everything. If you'd like to ask a more directed question, please see the descriptions below.</li>
22 22
       <li><tt>tor-ops</tt> gets to the people who manage the directory authorities. Use this if you run a Tor relay and have a question or problem with your relay.</li>
... ...
@@ -36,4 +36,4 @@
36 36
   <!-- END SIDECOL -->
37 37
 </div>
38 38
 <!-- END CONTENT -->
39
-#include <foot.wmi>   
39
+#include <foot.wmi>
... ...
@@ -9,54 +9,143 @@
9 9
     <a href="<page about/corepeople>">Tor People</a>
10 10
   </div>
11 11
 	<div id="maincol">
12
+
13
+    <p>The Tor Project is a 501(c)(3) non-profit based in
14
+    the United States. The official address of the organization is:
15
+    </p>
16
+
17
+    <address>
18
+    The Tor Project<br />
19
+    969 Main Street, Suite 206<br />
20
+    Walpole, MA 02081-2972 USA<br /><br />
21
+    </address>
22
+
23
+    <p>The organization consists of many volunteers and a few employees.
24
+    Please don't contact us individually about Tor topics &mdash; if you
25
+    have a problem or question, please look through the <a href="<page
26
+    about/contact>">contact page</a> for appropriate addresses.</p>
27
+
12 28
   	<h1>Core Tor People</h1>
13 29
     <table>
14 30
     	<tr>
15 31
         <td class="beige">
16
-          <div class="name">Staff Member Name</div>
17
-          <div class="caps">Staff Member Title</div>
18
-          <p>Staff Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
32
+          <div class="name">Carolyn Anhalt</div>
33
+          <div class="caps">Community and Translation Coordinator</div>
34
+          <p>Responsible for growing Tor's community moderators and translators.</p>
35
+        </td>
36
+        <td>
37
+          <div class="name">Jacob Appelbaum</div>
38
+          <div class="caps">Developer, Advocate, and Security Researcher</div>
39
+          <p>Our main advocate.  Speaks at conferences and gives trainings all over the world to get people excited about Tor, explain how Tor is used in real world situations, and generally explains why anonymity online matters to you.  Original developer of ttdnsd, <a href="https://check.torproject.org/">Tor check</a>, <a href="https://exitlist.torproject.org/">Tor DNSEL</a>, and <a href="https://weather.torproject.org">Tor weather site.</p>
40
+        </td>
41
+      </tr>
42
+      <tr>
43
+        <td>
44
+          <div class="name">Erinn Clark</div>
45
+          <div class="caps">Packaging and Build Automation</div>
46
+          <p>Erinn is tackling the growing needs for easy to install and configure packages on a variety of operating systems.  Also working on automating the build system and producing nightly builds for all operating systems we support.</p>
47
+        </td>
48
+        <td class="beige">
49
+          <div class="name">Christopher Davis</div>
50
+          <div class="caps">Libevent hacker and Polipo maintainer</div>
51
+          <p>Worked during Google Summer of Code 2009 on porting Polipo to Windows and on helping with the libevent bufferevent code. Now he's the Polipo maintainer.</p>
52
+        </td>
53
+      </tr>
54
+      <tr>
55
+        <td class="beige">
56
+          <div class="name">Roger Dingledine</div>
57
+          <div class="caps">Project Leader; Director, Researcher</div>
58
+          <p>Original developer of Tor along with Nick Mathewson and Paul Syverson. Leading researcher in the anonymous communications field.  Frequent speaker at conferences to advocate Tor, explain what Tor is and can do, and helps coordinate academic researchers.</p>
59
+        </td>
60
+        <td>
61
+          <div class="name">Matt Edman</div>
62
+          <div class="caps">Vidalia Developer; Researcher</div>
63
+          <p>Lead developer for <a href="<page projects/vidalia>">Vidalia</a>, a cross-platform Tor GUI included in the bundles.</p>
64
+        </td>
65
+      </tr>
66
+      <tr>
67
+        <td>
68
+          <div class="name">Nathan Freitas</div>
69
+          <div class="caps">Mobile phone hacker</div>
70
+          <p>The driving force behind Tor on the Android platform in the form of <a href="<page docs/android>">Orbot.</p>
71
+        </td>
72
+        <td class="beige">
73
+          <div class="name">Christian Fromme</div>
74
+          <div class="caps">Developer</div>
75
+          <p>Christian works on all things python for Tor.  He enhanced and maintains a slew of codebases for us, such as the get-tor email auto-responder, check.torproject.org, bridge db, tor weather, tor controller, tor flow, etc.</p>
76
+        </td>
77
+      </tr>
78
+      <tr>
79
+        <td class="beige">
80
+          <div class="name">Melissa Gilroy</div>
81
+          <div class="caps">CFO and Internal Audit</div>
82
+          <p>With a strong background in non-profit accounting and auditing, Melissa is in charge of Tor's finances, audit compliance, and keeping Tor's financial operations moving along.</p>
83
+        </td>
84
+        <td>
85
+          <div class="name">Sebastian Hahn</div>
86
+          <div class="caps">Developer</div>
87
+          <p>Worked during the 2008 Google Summer of Code on a networking application to automatically carry out tests for Tor and during the 2009 Google Summer of Code on expanding our secure updater to include BitTorrent support. Generally manages out git repository, reviews code patches, and generally helps out a lot.</p>
88
+        </td>
89
+      </tr>
90
+      <tr>
91
+        <td>
92
+          <div class="name">Damian Johnson</div>
93
+          <div class="caps">ARM Developer</div>
94
+          <p>Builds a command-line application for monitoring Tor relays, providing real-time status information such as the current
95
+    configuration, bandwidth usage, message log, etc. (<a href="http://atagar.com/arm">ARM</a>).</p>
96
+        </td>
97
+        <td class="beige">
98
+          <div class="name">Andrew Lewman</div>
99
+          <div class="caps">Executive Director; Director; <a href="<page press/press>">press contact</a></div>
100
+          <p>Manages the business operations of The Tor Project, Inc.  Plays roles of finance, advocacy, project management, and general support.</p>
101
+        </td>
102
+      </tr>
103
+      <tr>
104
+        <td class="beige">
105
+          <div class="name">Dr. Karsten Loesing</div>
106
+          <div class="caps">Researchers and Developer</div>
107
+          <p>Worked during the 2007 Google Summer of Code on <a href="<gitblob>doc/spec/proposals/114-distributed-storage.txt">distributing and securing the publishing and fetching of hidden service descriptors</a>. Currently working on <a href="<page projects/hidserv>">making hidden services faster and more reliable</a>, and on <a href="http://metrics.torproject.org/">metrics</a>.</p>
19 108
         </td>
20 109
         <td>
21
-          <div class="name">Staff Member Name</div>
22
-          <div class="caps">Staff Member Title</div>
23
-          <p>Staff Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
110
+          <div class="name">Nick Mathewson</div>
111
+          <div class="caps">Chief Architect, Researcher, Director</div>
112
+          <p>One of the three original designers of Tor; does a lot of the ongoing design work. One of the two main developers, along with Roger.</p>
24 113
         </td>
25 114
       </tr>
26 115
       <tr>
27 116
         <td>
28
-          <div class="name">Staff Member Name</div>
29
-          <div class="caps">Staff Member Title</div>
30
-          <p>Staff Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
117
+          <div class="name">Dr. Steven Murdoch</div>
118
+          <div class="caps">Researcher and Developer</div>
119
+          <p>Researcher at the University of Cambridge, currently funded by The Tor Project to improve the security, performance, and usability of Tor. Creator of the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>.</p>
31 120
         </td>
32 121
         <td class="beige">
33
-          <div class="name">Staff Member Name</div>
34
-          <div class="caps">Staff Member Title</div>
35
-          <p>Staff Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
122
+          <div class="name">Peter Palfrader</div>
123
+          <div class="caps">Sysadmin and Developer</div>
124
+          <p>Manages the Debian packages, runs one of the directory authorities, runs the website and the wiki, and generally helps out a lot.</p>
36 125
         </td>
37 126
       </tr>
38 127
       <tr>
39 128
         <td class="beige">
40
-          <div class="name">Staff Member Name</div>
41
-          <div class="caps">Staff Member Title</div>
42
-          <p>Staff Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
129
+          <div class="name">Mike Perry</div>
130
+          <div class="caps">Torbutton and Tor Performance Developer</div>
131
+          <p>Author of <a href="https://svn.torproject.org/svn/torflow/trunk/README">TorFlow</a>, a Tor controller that builds paths through the Tor network and measures various properties and behaviors, and new author of <a href="<page projects/torbutton>">Torbutton</a>.</p>
43 132
         </td>
44 133
         <td>
45
-          <div class="name">Staff Member Name</div>
46
-          <div class="caps">Staff Member Title</div>
47
-          <p>Staff Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
134
+          <div class="name">Karen Reilly</div>
135
+          <div class="caps">Marketing, Fundraising, and Grant Development Director</div>
136
+          <p>Responsible for fundraising, advocacy, and general marketing and outreach programs for Tor.</p>
48 137
         </td>
49 138
       </tr>
50 139
       <tr>
51 140
         <td>
52
-          <div class="name">Staff Member Name</div>
53
-          <div class="caps">Staff Member Title</div>
54
-          <p>Staff Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
141
+          <div class="name">Runa A. Sandvik</div>
142
+          <div class="caps">Translation Coordinator</div>
143
+          <p>Maintains the <a href="https://translation.torproject.org/">Tor Translation Portal</a>, and works on automatically converting our website wml files to po files (and back) so that they can be handled by <a href="http://translate.sourceforge.net/wiki/pootle/index">Pootle</a>.</p>
55 144
         </td>
56 145
         <td class="beige">
57
-          <div class="name">Staff Member Name</div>
58
-          <div class="caps">Staff Member Title</div>
59
-          <p>Staff Member is tackling the growing needs for easy to configure packages on many operating systems. She’s also automating the build system and producing nightly builds for all operating systems we support.</p>
146
+          <div class="name">Paul Syverson</div>
147
+          <div class="caps">Researcher</div>
148
+          <p>Inventor of <a href="http://www.onion-router.net/">Onion Routing</a>, original designer of Tor along with Roger and Nick, and project leader for original design, development, and deployment of Tor. Currently helps out with research and design.</p>
60 149
         </td>
61 150
       </tr>
62 151
     </table>
... ...
@@ -71,4 +160,4 @@
71 160
   <!-- END SIDECOL -->
72 161
 </div>
73 162
 <!-- END CONTENT -->
74
-#include <foot.wmi> 
163
+#include <foot.wmi>
... ...
@@ -11,7 +11,7 @@
11 11
   </div>
12 12
   <div class="maincol">
13 13
     <h2>Tor: People</h2>
14
-    
14
+
15 15
     #<!-- BEGIN SIDEBAR -->
16 16
     #<div class="sidebar-left">
17 17
     #<h3>Sections</h3>
... ...
@@ -25,82 +25,81 @@
25 25
     #</ul>
26 26
     #</div>
27 27
     #<!-- END SIDEBAR -->
28
-    
28
+
29 29
     <p>The Tor Project is a 501(c)(3) non-profit based in
30 30
     the United States. The official address of the organization is:
31 31
     </p>
32
-    
32
+
33 33
     <address>
34 34
     The Tor Project<br />
35 35
     969 Main Street, Suite 206<br />
36
-    Walpole, MA 02081 USA<br /><br />
36
+    Walpole, MA 02081-2972 USA<br /><br />
37 37
     </address>
38
-    
38
+
39 39
     <p>The organization consists of many volunteers and a few employees.
40 40
     Please don't contact us individually about Tor topics &mdash; if you
41 41
     have a problem or question, please look through the <a href="<page
42 42
     about/contact>">contact page</a> for appropriate addresses.</p>
43
-    
43
+
44 44
     <div class="underline"></div>
45 45
     <a id="Core"></a>
46 46
     <h3><a class="anchor" href="#Core">Core Tor people:</a></h3>
47
-    
47
+
48 48
     <dl>
49 49
     <dt>Carolyn Anhalt (Community and Translation
50 50
     Coordinator)</dt><dd>Responsible for growing Tor's community
51 51
     moderators and translators.</dd>
52
-    
52
+
53 53
     <dt>Jacob Appelbaum (Developer and Advocate)</dt><dd>Runs
54 54
     the <a href="https://check.torproject.org/">Tor DNSEL</a> <a
55 55
     href="http://exitlist.torproject.org/">site</a>, and also the in-progress
56 56
     Tor weather site.</dd>
57
-    
57
+
58 58
     <dt>Erinn Clark (Packaging and Build Automation)</dt><dd>Erinn is tackling
59 59
     the growing needs for easy to install and configure packages on a variety
60 60
     of operating systems.  Also working on automating the build system and
61 61
     producing nightly builds for all operating systems we support.</dd>
62
-    
62
+
63 63
     <dt>Christopher Davis</dt><dd>Worked during Google Summer of Code 2009
64 64
     on porting Polipo to Windows and on helping with the libevent bufferevent
65 65
     code. Now he's the Polipo maintainer.</dd>
66
-    
66
+
67 67
     <dt>Roger Dingledine (Project Leader; Director)</dt><dd>Original
68 68
     developer of Tor; now plays pretty much all the roles to keep everything
69 69
     on track.</dd>
70
-    
70
+
71 71
     <dt>Matt Edman (Developer)</dt><dd>Lead developer for <a href="<page
72 72
     projects/vidalia>">Vidalia</a>, a cross-platform Tor GUI included in the
73 73
     Windows and OS X bundles.</dd>
74
-    
74
+
75 75
     <dt>Nathan Freitas</dt><dd>The driving force behind Tor on the Android
76 76
     platform in the form of <a href="<page docs/android>">Orbot</a>.</dd>
77
-    
77
+
78 78
     <dt>Christian Fromme (Developer)</dt><dd>Christian works on all things
79 79
     python for Tor.  He enhanced and maintains a slew of codebases for us,
80 80
     such as the get-tor email auto-responder, check.torproject.org, bridge
81 81
     db, tor weather, tor controller, tor flow, etc.</dd>
82
-    
82
+
83 83
     <dt>Melissa Gilroy (CFO and Internal Audit)</dt><dd>With a strong
84 84
     background in non-profit accounting and auditing, Melissa is in charge of
85 85
     Tor's finances, audit compliance, and keeping Tor's financial operations
86 86
     moving along.</dd>
87
-    
87
+
88 88
     <dt>Sebastian Hahn</dt><dd> Worked during the 2008 Google Summer of
89 89
     Code on a networking application to automatically carry out tests for
90 90
     Tor and during the 2009 Google Summer of Code on expanding Thandy to
91 91
     include BitTorrent support. Generally helps out a lot.</dd>
92
-    
92
+
93 93
     <dt>Damian Johnson</dt><dd>Builds a command-line application for monitoring
94 94
     Tor relays, providing real-time status information such as the current
95 95
     configuration, bandwidth usage, message log, etc. (<a
96 96
     href="https://svn.torproject.org/svn/arm/trunk/README">code</a>).</dd>
97
-    
97
+
98 98
     <dt>Andrew Lewman (Executive Director; Director; <a href="<page
99 99
     press/press>">press contact</a>)</dt><dd>Manages the business operations
100 100
     of The Tor Project, Inc.  Plays roles of finance, advocacy, project
101
-    management, and general support.  General package hacker for Windows,
102
-    OS X, and various linux distributions.</dd>
103
-    
101
+    management, and general support.</dd>
102
+
104 103
     <dt>Karsten Loesing (Developer)</dt><dd>
105 104
     Worked during the 2007 Google Summer of Code on <a
106 105
     href="<gitblob>doc/spec/proposals/114-distributed-storage.txt">distributing
... ...
@@ -108,76 +107,50 @@
108 107
     service descriptors</a>. Currently working on <a href="<page
109 108
     projects/hidserv>">making hidden services faster and more reliable</a>,
110 109
     and on <a href="http://metrics.torproject.org/">metrics</a>.</dd>
111
-    
110
+
112 111
     <dt>Nick Mathewson (Chief architect; Director)</dt><dd>One of the
113 112
     three original designers of Tor; does a lot of the ongoing design work.
114 113
     One of the two main developers, along with Roger.</dd>
115
-    
114
+
116 115
     <dt>Steven Murdoch (Researcher and Developer)</dt><dd>Researcher at
117 116
     the University of Cambridge, currently funded by The Tor Project to
118 117
     improve the security, performance, and usability of Tor. Creator of the
119 118
     <a href="<page projects/torbrowser>">Tor Browser Bundle</a>.</dd>
120
-    
119
+
121 120
     <dt>Peter Palfrader</dt><dd>Manages the Debian packages, runs one of
122 121
     the directory authorities, runs the website and the wiki, and generally
123 122
     helps out a lot.</dd>
124
-    
123
+
125 124
     <dt>Mike Perry (Developer)</dt><dd>Author of <a
126 125
     href="https://svn.torproject.org/svn/torflow/trunk/README">TorFlow</a>,
127 126
     a Tor controller that builds paths through the Tor network and measures
128 127
     various properties and behaviors, and new author of <a href="<page
129 128
     projects/torbutton>">Torbutton</a>.</dd>
130
-    
129
+
131 130
     <dt>Karen Reilly (Development Director)</dt><dd>Responsible for
132 131
     fundraising, advocacy, and general marketing and outreach programs
133 132
     for Tor.</dd>
134
-    
133
+
135 134
     <dt>Runa A. Sandvik</dt><dd>Maintains the <a
136 135
     href="https://translation.torproject.org/">Tor Translation
137 136
     Portal</a>, and works on automatically converting our website wml
138 137
     files to po files (and back) so that they can be handled by <a
139 138
     href="http://translate.sourceforge.net/wiki/pootle/index">Pootle</a>.</dd>
140
-    
139
+
141 140
     <dt>Paul Syverson</dt><dd>Inventor of <a
142 141
     href="http://www.onion-router.net/">Onion Routing</a>, original designer
143 142
     of Tor along with Roger and Nick, and project leader for original design,
144 143
     development, and deployment of Tor. Currently helps out with research
145 144
     and design.</dd>
146 145
     </dl>
147
-    
146
+
148 147
     <div class="underline"></div>
149
-    <a id="Board"></a>
150
-    <h3><a class="anchor" href="#Board">The Tor Project Board of
151
-    Directors:</a></h3>
152
-    
153
-    <dl>
154
-    <dt>Meredith Hoban Dunn (Director)</dt><dd>Our audit committee chair. Her
155
-    role is to help us make sure we're able to pass our upcoming corporate
156
-    audits correctly, watch for internal fraud, tell us when we're doing
157
-    things in a non-standard way, and so on.</dd>
158
-    
159
-    <dt>Ian Goldberg (Director)</dt><dd>Cryptographer,
160
-    privacy expert, and professor; one of the designers of <a
161
-    href="http://www.cypherpunks.ca/otr/">Off-the-Record Messaging</a>.</dd>
162
-    
163
-    <dt>Xianghui (Isaac) Mao (Director)</dt><dd>Chinese blogging
164
-    and privacy activist.  His current activities can be found at <a
165
-    href="http://isaacmao.com/">his website</a>.</dd>
166
-    
167
-    <dt>Frank Rieger (Director)</dt><dd>CTO of <a
168
-    href="http://www.gsmk.de/">GSMK Cryptophone</a>.</dd>
169
-    
170
-    <dt>Wendy Seltzer (Director)</dt><dd>Lawyer,
171
-    cyberlaw professor, and founder of <a
172
-    href="http://chillingeffects.org/">ChillingEffects.org</a>.</dd>
173
-    
174
-    <dt>Along with Roger, Nick, and Andrew listed above as Directors.</dt>
175
-    </dl>
176
-    
148
+    <h3><a href="<page about/board>">The Tor Project Board of Directors:</a></h3>
149
+
177 150
     <div class="underline"></div>
178 151
     <a id="GSoC"></a>
179 152
     <h3><a class="anchor" href="#GSoC">Google Summer of Code 2010 students:</a></h3>
180
-    
153
+
181 154
     <dl>
182 155
     <dt>Kevin Berry</dt><dd>Working on a database schema to support better
183 156
     node churn metrics and on a more dynamic metrics website. Mentored by
... ...
@@ -191,11 +164,11 @@
191 164
     <dt>John Schanck</dt><dd>Works on improving the automated detection of
192 165
     misconfigured or malicious exit nodes. Mentored by Mike Perry.</dd>
193 166
     </dl>
194
-    
167
+
195 168
     <div class="underline"></div>
196 169
     <a id="Translators"></a>
197 170
     <h3><a class="anchor" href="#Translators">Core translators:</a></h3>
198
-    
171
+
199 172
     <dl>
200 173
     <dt>Bogdan Drozdowski</dt><dd><a
201 174
     href="https://www.torproject.org/index.html.pl">Polish</a>.</dd>
... ...
@@ -218,11 +191,11 @@
218 191
     <dt>ygrek</dt><dd><a
219 192
     href="https://www.torproject.org/index.html.ru">Russian</a>.</dd>
220 193
     </dl>
221
-    
194
+
222 195
     <div class="underline"></div>
223 196
     <a id="Volunteers"></a>
224 197
     <h3><a class="anchor" href="#Volunteers">More volunteers:</a></h3>
225
-    
198
+
226 199
     <dl>
227 200
     <dt>Anonym</dt><dd>Maintainer of the Incognito LiveCD.</dd>
228 201
     <dt>Kevin Bankston</dt><dd>EFF lawyer who helped write the <a
... ...
@@ -268,11 +241,11 @@
268 241
     href="http://freehaven.net/anonbib/">research papers</a> about Tor,
269 242
     people who teach others about Tor, etc.</dt>
270 243
     </dl>
271
-    
244
+
272 245
     <div class="underline"></div>
273 246
     <a id="Past"></a>
274 247
     <h3><a class="anchor" href="#Past">Past thanks to:</a></h3>
275
-    
248
+
276 249
     <dl>
277 250
     <dt>John Bashinski</dt><dd> Contributed the initial rpm spec file.</dd>
278 251
     <dt>Domenik Bork</dt><dd> Worked on
... ...
@@ -354,4 +327,4 @@
354 327
   <!-- END SIDECOL -->
355 328
 </div>
356 329
 <!-- END CONTENT -->
357
-#include <foot.wmi> 
330
+#include <foot.wmi>
... ...
@@ -16,35 +16,35 @@
16 16
     have a diversity of funding sources too &mdash; and we're eager to diversify
17 17
     even further! Our sponsorships are divided into levels based on total funding received:
18 18
     </p>
19
-    
19
+
20 20
     <h3><i>Magnoliophyta</i> (over $1 million)</h3>
21 21
     	<ul>
22
-    		<li>You?</li>
22
+    		<li>An anonymous North American NGO (2008-2010)</li>
23 23
     	</ul>
24
-    
24
+
25 25
     <h3><i>Liliopsida</i> (up to $750k)</h3>
26 26
     	<ul>
27
-    		<li>An anonymous North American NGO (2008-2010)</li>
27
+    		<li>You or your organization?</li>
28 28
     	</ul>
29
-    
29
+
30 30
     <h3><i>Asparagales</i> (up to $500k)</h3>
31 31
     	<ul>
32
-    		<li><a href="http://www.ibb.gov/">International Broadcasting Bureau</a> (2006-2010)</li>
32
+    		<li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2010)</li>
33 33
     		<li>An anonymous European NGO (2006-2008)</li>
34 34
     	</ul>
35
-    
35
+
36 36
     <h3><i>Alliaceae</i> (up to $200k)</h3>
37 37
     	<ul>
38
-    		<li>You?</li>
38
+    		<li>You or your organization?</li>
39 39
     	</ul>
40
-    
40
+
41 41
     <h3><i>Allium</i> (up to $100k)</h3>
42 42
     	<ul>
43 43
     		<li><a href="http://www.nlnet.nl/">NLnet Foundation</a> (2008-2009)</li>
44 44
     		<li><a href="http://chacs.nrl.navy.mil/">Naval Research Laboratory</a> (2006-2010)</li>
45 45
     		<li>An anonymous North American ISP (2009-2010)</li>
46 46
     	</ul>
47
-    
47
+
48 48
     <h3><i>Allium cepa</i> (up to $50k)</h3>
49 49
     	<ul>
50 50
     		<li><a href="<page donate/donate>">More than 500 personal donations from individuals like you</a> (2006-2010)</li>
... ...
@@ -54,7 +54,7 @@
54 54
     		<li><a href="http://www.torfox.org/">Torfox</a> (2009)</li>
55 55
         <li><a href="http://www.shinjiru.com/">Shinjiru Technology</a> (2009-2010)</li>
56 56
       </ul>
57
-    
57
+
58 58
     <h3>Past sponsors</h3>
59 59
     <p>We greatly appreciate the support provided by our past sponsors in keeping the pre-501(c)(3) Tor Project progressing through our ambitious goals:</p>
60 60
     	<ul>
... ...
@@ -79,4 +79,4 @@
79 79
   <!-- END SIDECOL -->
80 80
 </div>
81 81
 <!-- END CONTENT -->
82
-#include <foot.wmi> 
82
+#include <foot.wmi>
... ...
@@ -138,7 +138,7 @@ function clientSpecificDownload() {
138 138
           <div class="user">
139 139
             <img src="images/consumers.jpg" alt="Consumer Advocates" />
140 140
             <h3>Consumer Advocates</h3>
141
-            <p>Here, you can put a quick sentence about what the featured user or user-group uses Tor for.</p>
141
+            <p>NEEDS TEXT.</p>
142 142
           </div>
143 143
           <div class="user">
144 144
             <img src="images/activists.jpg" alt="Activists &amp Whistleblowers" />
... ...
@@ -169,7 +169,7 @@ function clientSpecificDownload() {
169 169
             <tr>
170 170
               <td>
171 171
                 <div class="calendar"><span class="month">Apr</span><br /><span class="day">27</span></div>
172
-                <p>Tor 0.2.1.24 released as stable. Fixes compatibility with recent Apple OSX openssl changes and adds some performance enhancements.<br /><span class="continue"><a href="#">Read the full list of changes &raquo;</a></span></p>
172
+                <p>Tor 0.2.1.26 released as stable. Fixes compatibility with recent Apple OSX openssl changes and adds some performance enhancements.<br /><span class="continue"><a href="#">Read the full list of changes &raquo;</a></span></p>
173 173
               </td>
174 174
             </tr>
175 175
           </table>