Browse code

Merging TBB and TorBrowser on the volunteer page

The TBB and TorBrowser projects link to the same landing page, the same code,
and the same bug tracker. May as well make them the same entry. :P

Damian Johnson authored on04/03/2013 17:37:03
Showing1 changed files
... ...
@@ -105,22 +105,14 @@ meetings around the world.</li>
105 105
       </tr>
106 106
 
107 107
       <tr>
108
-        <td><a href="#project-tbb">TBB</a></td>
109
-        <td>Bundle</td>
110
-        <td>Sys Admin</td>
111
-        <td>Moderate</td>
112
-        <td>Erinn</td>
113
-      </tr>
114
-
115
-      <tr class="alt">
116 108
         <td><a href="#project-torbrowser">Tor Browser</a></td>
117
-        <td>Browser</td>
109
+        <td>Bundle</td>
118 110
         <td>C</td>
119 111
         <td>Moderate</td>
120
-        <td>mikeperry, pearl crescent</td>
112
+        <td>mikeperry, Erinn</td>
121 113
       </tr>
122 114
 
123
-      <tr>
115
+      <tr class="alt">
124 116
         <td><a href="#project-torbutton">Torbutton</a></td>
125 117
         <td>Browser Add-on</td>
126 118
         <td>Javascript</td>
... ...
@@ -128,7 +120,7 @@ meetings around the world.</li>
128 120
         <td>mikeperry</td>
129 121
       </tr>
130 122
 
131
-      <tr class="alt">
123
+      <tr>
132 124
         <td><a href="#project-httpseverywhere">HTTPS Everywhere</a></td>
133 125
         <td>Browser Add-on</td>
134 126
         <td>Javascript</td>
... ...
@@ -136,7 +128,7 @@ meetings around the world.</li>
136 128
         <td>pde, mikeperry</td>
137 129
       </tr>
138 130
 
139
-      <tr>
131
+      <tr class="alt">
140 132
         <td><a href="#project-vidalia">Vidalia</a></td>
141 133
         <td>User Interface</td>
142 134
         <td>C++, Qt</td>
... ...
@@ -144,7 +136,7 @@ meetings around the world.</li>
144 136
         <td>chiiph</td>
145 137
       </tr>
146 138
 
147
-      <tr class="alt">
139
+      <tr>
148 140
         <td><a href="#project-arm">Arm</a></td>
149 141
         <td>User Interface</td>
150 142
         <td>Python, Curses</td>
... ...
@@ -152,7 +144,7 @@ meetings around the world.</li>
152 144
         <td>atagar</td>
153 145
       </tr>
154 146
 
155
-      <tr>
147
+      <tr class="alt">
156 148
         <td><a href="#project-orbot">Orbot</a></td>
157 149
         <td>User Interface</td>
158 150
         <td>Java</td>
... ...
@@ -160,7 +152,7 @@ meetings around the world.</li>
160 152
         <td>n8fr8, ioerror</td>
161 153
       </tr>
162 154
 
163
-      <tr class="alt">
155
+      <tr>
164 156
         <td><a href="#project-tails">Tails</a></td>
165 157
         <td>OS image</td>
166 158
         <td>Sys Admin</td>
... ...
@@ -168,7 +160,7 @@ meetings around the world.</li>
168 160
         <td><a href="https://tails.boum.org/">#tails</a></td>
169 161
       </tr>
170 162
 
171
-      <tr>
163
+      <tr class="alt">
172 164
         <td><a href="#project-torramdisk">tor-ramdisk</a></td>
173 165
         <td>OS image</td>
174 166
         <td>Sys Admin</td>
... ...
@@ -176,7 +168,7 @@ meetings around the world.</li>
176 168
         <td>blueness</td>
177 169
       </tr>
178 170
 
179
-      <tr class="alt">
171
+      <tr>
180 172
         <td>*<a href="#project-torouter">Torouter</a></td>
181 173
         <td>OS image</td>
182 174
         <td>Sys Admin</td>
... ...
@@ -184,7 +176,7 @@ meetings around the world.</li>
184 176
         <td>ioerror</td>
185 177
       </tr>
186 178
 
187
-      <tr>
179
+      <tr class="alt">
188 180
         <td><a href="#project-torsocks">Torsocks</a></td>
189 181
         <td>Usability</td>
190 182
         <td>C</td>
... ...
@@ -192,7 +184,7 @@ meetings around the world.</li>
192 184
         <td>ioerror, nickm</td>
193 185
       </tr>
194 186
 
195
-      <tr class="alt">
187
+      <tr>
196 188
         <td><a href="#project-torbirdy">TorBirdy</a></td>
197 189
         <td>Browser Add-on</td>
198 190
         <td>JavaScript</td>
... ...
@@ -200,7 +192,7 @@ meetings around the world.</li>
200 192
         <td>Sukhbir (sukhe), ioerror</td>
201 193
       </tr>
202 194
 
203
-      <tr>
195
+      <tr class="alt">
204 196
         <td><a href="#project-obfsproxy">Obfsproxy</a></td>
205 197
         <td>Client Add-on</td>
206 198
         <td>C, Python</td>
... ...
@@ -208,7 +200,7 @@ meetings around the world.</li>
208 200
         <td>asn, nickm</td>
209 201
       </tr>
210 202
 
211
-      <tr class="alt">
203
+      <tr>
212 204
         <td><a href="#project-flash-proxy">Flash Proxy</a></td>
213 205
         <td>Client Add-on</td>
214 206
         <td>Python, JavaScript, Go</td>
... ...
@@ -216,7 +208,7 @@ meetings around the world.</li>
216 208
         <td>dcf, aallai, jct</td>
217 209
       </tr>
218 210
 
219
-      <tr>
211
+      <tr class="alt">
220 212
         <td>*<a href="#project-thandy">Thandy</a></td>
221 213
         <td>Updater</td>
222 214
         <td>Python</td>
... ...
@@ -224,7 +216,7 @@ meetings around the world.</li>
224 216
         <td>chiiph, Erinn, nickm</td>
225 217
       </tr>
226 218
 
227
-      <tr class="alt">
219
+      <tr>
228 220
         <td><a href="#project-shadow">Shadow</a></td>
229 221
         <td>Simulator</td>
230 222
         <td>C, Python</td>
... ...
@@ -232,7 +224,7 @@ meetings around the world.</li>
232 224
         <td>robgjansen</td>
233 225
       </tr>
234 226
 
235
-      <tr>
227
+      <tr class="alt">
236 228
         <td><a href="#project-stem">Stem</a></td>
237 229
         <td>Library</td>
238 230
         <td>Python</td>
... ...
@@ -240,7 +232,7 @@ meetings around the world.</li>
240 232
         <td>atagar, neena</td>
241 233
       </tr>
242 234
 
243
-      <tr class="alt">
235
+      <tr>
244 236
         <td><a href="#project-txtorcon">Txtorcon</a></td>
245 237
         <td>Library</td>
246 238
         <td>Python, Twisted</td>
... ...
@@ -248,7 +240,7 @@ meetings around the world.</li>
248 240
         <td>meejah</td>
249 241
       </tr>
250 242
 
251
-      <tr>
243
+      <tr class="alt">
252 244
         <td><a href="#project-tlsdate">Tlsdate</a></td>
253 245
         <td>Utility</td>
254 246
         <td>C</td>
... ...
@@ -256,7 +248,7 @@ meetings around the world.</li>
256 248
         <td>ioerror</td>
257 249
       </tr>
258 250
 
259
-      <tr class="alt">
251
+      <tr>
260 252
         <td><a href="#project-metrics">Metrics</a></td>
261 253
         <td>Client Service</td>
262 254
         <td>Java</td>
... ...
@@ -264,7 +256,7 @@ meetings around the world.</li>
264 256
         <td>karsten</td>
265 257
       </tr>
266 258
 
267
-      <tr>
259
+      <tr class="alt">
268 260
         <td><a href="#project-atlas">Atlas</a></td>
269 261
         <td>Client Service</td>
270 262
         <td>JavaScript</td>
... ...
@@ -272,7 +264,7 @@ meetings around the world.</li>
272 264
         <td>hellais</td>
273 265
       </tr>
274 266
 
275
-      <tr class="alt">
267
+      <tr>
276 268
         <td><a href="#project-torstatus">TorStatus</a></td>
277 269
         <td>Client Service</td>
278 270
         <td>Python, Django</td>
... ...
@@ -280,7 +272,7 @@ meetings around the world.</li>
280 272
         <td></td>
281 273
       </tr>
282 274
 
283
-      <tr>
275
+      <tr class="alt">
284 276
         <td><a href="#project-compass">Compass</a></td>
285 277
         <td>Client Service</td>
286 278
         <td>Python</td>
... ...
@@ -288,7 +280,7 @@ meetings around the world.</li>
288 280
         <td>gsathya, karsten</td>
289 281
       </tr>
290 282
 
291
-      <tr class="alt">
283
+      <tr>
292 284
         <td><a href="#project-onionoo">Onionoo</a></td>
293 285
         <td>Backend Service</td>
294 286
         <td>Java, Python</td>
... ...
@@ -296,7 +288,7 @@ meetings around the world.</li>
296 288
         <td>karsten, gsathya</td>
297 289
       </tr>
298 290
 
299
-      <tr>
291
+      <tr class="alt">
300 292
         <td><a href="#project-weather">Weather</a></td>
301 293
         <td>Client Service</td>
302 294
         <td>Python</td>
... ...
@@ -304,7 +296,7 @@ meetings around the world.</li>
304 296
         <td>kaner</td>
305 297
       </tr>
306 298
 
307
-      <tr class="alt">
299
+      <tr>
308 300
         <td><a href="#project-gettor">GetTor</a></td>
309 301
         <td>Client Service</td>
310 302
         <td>Python</td>
... ...
@@ -312,7 +304,7 @@ meetings around the world.</li>
312 304
         <td>kaner</td>
313 305
       </tr>
314 306
 
315
-      <tr>
307
+      <tr class="alt">
316 308
         <td><a href="#project-torcheck">TorCheck</a></td>
317 309
         <td>Client Service</td>
318 310
         <td>Python, Perl</td>
... ...
@@ -320,7 +312,7 @@ meetings around the world.</li>
320 312
         <td>ioerror</td>
321 313
       </tr>
322 314
 
323
-      <tr class="alt">
315
+      <tr>
324 316
         <td><a href="#project-bridgedb">BridgeDB</a></td>
325 317
         <td>Backend Service</td>
326 318
         <td>Python</td>
... ...
@@ -328,7 +320,7 @@ meetings around the world.</li>
328 320
         <td>kaner, nickm</td>
329 321
       </tr>
330 322
 
331
-      <tr>
323
+      <tr class="alt">
332 324
         <td><a href="#project-ooni-probe">Ooni Probe</a></td>
333 325
         <td>Scanner</td>
334 326
         <td>Python</td>
... ...
@@ -336,7 +328,7 @@ meetings around the world.</li>
336 328
         <td>hellais, isis, ioerror</td>
337 329
       </tr>
338 330
 
339
-      <tr class="alt">
331
+      <tr>
340 332
         <td><a href="#project-torflow">TorFlow</a></td>
341 333
         <td>Backend Service</td>
342 334
         <td>Python</td>
... ...
@@ -344,7 +336,7 @@ meetings around the world.</li>
344 336
         <td>aagbsn, mikeperry</td>
345 337
       </tr>
346 338
 
347
-      <tr>
339
+      <tr class="alt">
348 340
         <td>*<a href="#project-torbel">TorBEL</a></td>
349 341
         <td>Backend Service</td>
350 342
         <td>Python</td>
... ...
@@ -352,7 +344,7 @@ meetings around the world.</li>
352 344
         <td>Sebastian</td>
353 345
       </tr>
354 346
 
355
-      <tr class="alt">
347
+      <tr>
356 348
         <td><a href="#project-tor2web">Tor2web</a></td>
357 349
         <td>Client Service</td>
358 350
         <td>Python</td>
... ...
@@ -360,7 +352,7 @@ meetings around the world.</li>
360 352
         <td>hellais</td>
361 353
       </tr>
362 354
 
363
-      <tr>
355
+      <tr class="alt">
364 356
         <td><a href="#project-anonbib">Anonbib</a></td>
365 357
         <td>Website</td>
366 358
         <td>Python</td>
... ...
@@ -407,7 +399,7 @@ meetings around the world.</li>
407 399
     isn't yet complete, and has been inactive since Fall 2010.
408 400
     </p>
409 401
 
410
-    <a id="project-tbb"></a>
402
+    <a id="project-torbrowser"></a>
411 403
     <h3><a href="<page projects/torbrowser>">Tor Browser Bundle</a> (<a
412 404
     href="https://gitweb.torproject.org/torbrowser.git">code</a>, <a
413 405
     href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+bundles/installation&order=priority">bug
... ...
@@ -416,7 +408,8 @@ meetings around the world.</li>
416 408
     <p>
417 409
     The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia,
418 410
     Torbutton, and a Firefox fork preconfigured to work together out of
419
-    the box. This is actively being worked on by Erinn Clark.
411
+    the box. It contains a modified copy of Firefox that aims to resolve the
412
+    privacy and security issues in mainline version.
420 413
     </p>
421 414
 
422 415
     <!--
... ...
@@ -427,17 +420,6 @@ meetings around the world.</li>
427 420
     </p>
428 421
     -->
429 422
 
430
-    <a id="project-torbrowser"></a>
431
-    <h3><a href="<page projects/torbrowser>">Tor Browser</a> (<a
432
-    href="https://gitweb.torproject.org/torbrowser.git">code</a>, <a
433
-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+bundles/installation&order=priority">bug
434
-    tracker</a>)</h3>
435
-
436
-    <p>
437
-    The Tor Browser is a modified Firefox that aims to resolve the privacy
438
-    and security issues in mainline Firefox.
439
-    </p>
440
-
441 423
     <a id="project-torbutton"></a>
442 424
     <h3><a href="<page torbutton/index>">Torbutton</a> (<a
443 425
     href="https://gitweb.torproject.org/torbutton.git">code</a>, <a