Restoring r25975, minus stub removal
Damian Johnson

Damian Johnson commited on 2012-12-29 03:24:59
Zeige 1 geänderte Dateien mit 60 Einfügungen und 67 Löschungen.


Peter's r25976 reversion was done in the name of expedience rather than making
the page better. Restoring what I had minus the removal of the stubs (which I
gather was the only objectionable bit). As mentioned on tor-assistants@ I plan
to remove those stubs later next week after the CCC crowd has passed.

Besides this made a few small fixes...

* You were labeling bridge-guard as being "Flash Proxy", likely a paste error.

* I've removed the empty links from the stubs. No links are better than broken
  links.

* Integrated the new Thandy links with the summary and switched it to use past
  tense. The project has been inactive for a long while.


... ...
@@ -140,7 +140,7 @@ meetings around the world.</li>
140 140
         <td><a href="#project-vidalia">Vidalia</a></td>
141 141
         <td>User Interface</td>
142 142
         <td>C++, Qt</td>
143
-        <td>Light</td>
143
+        <td>None</td>
144 144
         <td>chiiph</td>
145 145
       </tr>
146 146
 
... ...
@@ -156,7 +156,7 @@ meetings around the world.</li>
156 156
         <td><a href="#project-orbot">Orbot</a></td>
157 157
         <td>User Interface</td>
158 158
         <td>Java</td>
159
-        <td>Moderate</td>
159
+        <td>Light</td>
160 160
         <td>n8fr8, ioerror</td>
161 161
       </tr>
162 162
 
... ...
@@ -188,7 +188,7 @@ meetings around the world.</li>
188 188
         <td>*<a href="#project-torouter">Torouter</a></td>
189 189
         <td>OS image</td>
190 190
         <td>Sys Admin</td>
191
-        <td>Light</td>
191
+        <td>None</td>
192 192
         <td>ioerror</td>
193 193
       </tr>
194 194
 
... ...
@@ -196,7 +196,7 @@ meetings around the world.</li>
196 196
         <td><a href="#project-torsocks">Torsocks</a></td>
197 197
         <td>Usability</td>
198 198
         <td>C</td>
199
-        <td>Heavy</td>
199
+        <td>Moderate</td>
200 200
         <td>ioerror, nickm</td>
201 201
       </tr>
202 202
 
... ...
@@ -211,20 +211,20 @@ meetings around the world.</li>
211 211
       <tr class="alt">
212 212
         <td><a href="#project-obfsproxy">Obfsproxy</a></td>
213 213
         <td>Client Add-on</td>
214
-        <td>C</td>
215
-        <td>Light</td>
216
-        <td>nickm, asn</td>
214
+        <td>C, Python</td>
215
+        <td>Moderate</td>
216
+        <td>asn, nickm</td>
217 217
       </tr>
218 218
 
219
-      <tr class="alt">
219
+      <tr>
220 220
         <td><a href="#project-flash-proxy">Flash Proxy</a></td>
221 221
         <td>Client Add-on</td>
222 222
         <td>Python, JavaScript, Go</td>
223
-        <td>Moderate</td>
223
+        <td>Heavy</td>
224 224
         <td>dcf, aallai, jct</td>
225 225
       </tr>
226 226
 
227
-      <tr>
227
+      <tr class="alt">
228 228
         <td><a href="#project-brdgrd">bridge-guard</a></td>
229 229
         <td>Client Add-on</td>
230 230
         <td>C</td>
... ...
@@ -232,23 +232,23 @@ meetings around the world.</li>
232 232
         <td>phw</td>
233 233
       </tr>
234 234
 
235
-      <tr class="alt">
235
+      <tr>
236 236
         <td>*<a href="#project-thandy">Thandy</a></td>
237 237
         <td>Updater</td>
238 238
         <td>Python</td>
239
-        <td>Light</td>
239
+        <td>None</td>
240 240
         <td>chiiph, Erinn, nickm</td>
241 241
       </tr>
242 242
 
243
-      <tr>
243
+      <tr class="alt">
244 244
         <td><a href="#project-shadow">Shadow</a></td>
245 245
         <td>Simulator</td>
246 246
         <td>C, Python</td>
247
-        <td>Moderate</td>
247
+        <td>Heavy</td>
248 248
         <td>robgjansen</td>
249 249
       </tr>
250 250
 
251
-      <tr class="alt">
251
+      <tr>
252 252
         <td><a href="#project-experimentor">ExperimenTor</a></td>
253 253
         <td>Simulator</td>
254 254
         <td>C, Perl</td>
... ...
@@ -256,7 +256,7 @@ meetings around the world.</li>
256 256
         <td></td>
257 257
       </tr>
258 258
 
259
-      <tr>
259
+      <tr class="alt">
260 260
         <td><a href="#project-chutney">Chutney</a></td>
261 261
         <td>Simulator</td>
262 262
         <td>Python</td>
... ...
@@ -264,7 +264,7 @@ meetings around the world.</li>
264 264
         <td>nickm</td>
265 265
       </tr>
266 266
 
267
-      <tr class="alt">
267
+      <tr>
268 268
         <td><a href="#project-stem">Stem</a></td>
269 269
         <td>Library</td>
270 270
         <td>Python</td>
... ...
@@ -272,15 +272,15 @@ meetings around the world.</li>
272 272
         <td>atagar, neena</td>
273 273
       </tr>
274 274
 
275
-      <tr>
275
+      <tr class="alt">
276 276
         <td><a href="#project-txtorcon">Txtorcon</a></td>
277 277
         <td>Library</td>
278 278
         <td>Python, Twisted</td>
279
-        <td>Moderate</td>
279
+        <td>Heavy</td>
280 280
         <td>meejah</td>
281 281
       </tr>
282 282
 
283
-      <tr class="alt">
283
+      <tr>
284 284
         <td><a href="#project-torctl">TorCtl</a></td>
285 285
         <td>Library</td>
286 286
         <td>Python</td>
... ...
@@ -288,7 +288,7 @@ meetings around the world.</li>
288 288
         <td>aagbsn</td>
289 289
       </tr>
290 290
 
291
-      <tr>
291
+      <tr class="alt">
292 292
         <td><a href="#project-tlsdate">Tlsdate</a></td>
293 293
         <td>Utility</td>
294 294
         <td>C</td>
... ...
@@ -296,7 +296,7 @@ meetings around the world.</li>
296 296
         <td>ioerror</td>
297 297
       </tr>
298 298
 
299
-      <tr class="alt">
299
+      <tr>
300 300
         <td><a href="#project-metrics">Metrics</a></td>
301 301
         <td>Client Service</td>
302 302
         <td>Java</td>
... ...
@@ -304,15 +304,15 @@ meetings around the world.</li>
304 304
         <td>karsten</td>
305 305
       </tr>
306 306
 
307
-      <tr>
307
+      <tr class="alt">
308 308
         <td><a href="#project-atlas">Atlas</a></td>
309 309
         <td>Client Service</td>
310 310
         <td>JavaScript</td>
311
-        <td>Moderate</td>
311
+        <td>Light</td>
312 312
         <td>hellais</td>
313 313
       </tr>
314 314
 
315
-      <tr class="alt">
315
+      <tr>
316 316
         <td><a href="#project-torstatus">TorStatus</a></td>
317 317
         <td>Client Service</td>
318 318
         <td>Python, Django</td>
... ...
@@ -320,15 +320,15 @@ meetings around the world.</li>
320 320
         <td></td>
321 321
       </tr>
322 322
 
323
-      <tr>
323
+      <tr class="alt">
324 324
         <td><a href="#project-compass">Compass</a></td>
325 325
         <td>Client Service</td>
326 326
         <td>Python</td>
327
-        <td>Heavy</td>
327
+        <td>Light</td>
328 328
         <td>gsathya, karsten</td>
329 329
       </tr>
330 330
 
331
-      <tr class="alt">
331
+      <tr>
332 332
         <td><a href="#project-torperf">Torperf</a></td>
333 333
         <td>Client Service</td>
334 334
         <td>C, Python</td>
... ...
@@ -336,7 +336,7 @@ meetings around the world.</li>
336 336
         <td>karsten</td>
337 337
       </tr>
338 338
 
339
-      <tr>
339
+      <tr class="alt">
340 340
         <td><a href="#project-onionoo">Onionoo</a></td>
341 341
         <td>Backend Service</td>
342 342
         <td>Java, Python</td>
... ...
@@ -344,7 +344,7 @@ meetings around the world.</li>
344 344
         <td>karsten, gsathya</td>
345 345
       </tr>
346 346
 
347
-      <tr class="alt">
347
+      <tr>
348 348
         <td><a href="#project-weather">Weather</a></td>
349 349
         <td>Client Service</td>
350 350
         <td>Python</td>
... ...
@@ -352,7 +352,7 @@ meetings around the world.</li>
352 352
         <td>kaner</td>
353 353
       </tr>
354 354
 
355
-      <tr>
355
+      <tr class="alt">
356 356
         <td><a href="#project-gettor">GetTor</a></td>
357 357
         <td>Client Service</td>
358 358
         <td>Python</td>
... ...
@@ -360,7 +360,7 @@ meetings around the world.</li>
360 360
         <td>kaner</td>
361 361
       </tr>
362 362
 
363
-      <tr class="alt">
363
+      <tr>
364 364
         <td><a href="#project-torcheck">TorCheck</a></td>
365 365
         <td>Client Service</td>
366 366
         <td>Python, Perl</td>
... ...
@@ -368,7 +368,7 @@ meetings around the world.</li>
368 368
         <td>ioerror</td>
369 369
       </tr>
370 370
 
371
-      <tr>
371
+      <tr class="alt">
372 372
         <td><a href="#project-bridgedb">BridgeDB</a></td>
373 373
         <td>Backend Service</td>
374 374
         <td>Python</td>
... ...
@@ -376,15 +376,15 @@ meetings around the world.</li>
376 376
         <td>kaner, nickm</td>
377 377
       </tr>
378 378
 
379
-      <tr class="alt">
380
-        <td>*<a href="#project-ooni-probe">Ooni Probe</a></td>
379
+      <tr>
380
+        <td><a href="#project-ooni-probe">Ooni Probe</a></td>
381 381
         <td>Scanner</td>
382 382
         <td>Python</td>
383
-        <td>Moderate</td>
383
+        <td>Heavy</td>
384 384
         <td>hellais, isis, ioerror</td>
385 385
       </tr>
386 386
 
387
-      <tr>
387
+      <tr class="alt">
388 388
         <td><a href="#project-torflow">TorFlow</a></td>
389 389
         <td>Backend Service</td>
390 390
         <td>Python</td>
... ...
@@ -392,7 +392,7 @@ meetings around the world.</li>
392 392
         <td>aagbsn, mikeperry</td>
393 393
       </tr>
394 394
 
395
-      <tr class="alt">
395
+      <tr>
396 396
         <td>*<a href="#project-torbel">TorBEL</a></td>
397 397
         <td>Backend Service</td>
398 398
         <td>Python</td>
... ...
@@ -400,15 +400,15 @@ meetings around the world.</li>
400 400
         <td>Sebastian</td>
401 401
       </tr>
402 402
 
403
-      <tr>
403
+      <tr class="alt">
404 404
         <td><a href="#project-tor2web">Tor2web</a></td>
405 405
         <td>Client Service</td>
406 406
         <td>Python</td>
407
-        <td>Light</td>
407
+        <td>Heavy</td>
408 408
         <td>hellais</td>
409 409
       </tr>
410 410
 
411
-      <tr class="alt">
411
+      <tr>
412 412
         <td><a href="#project-anonbib">Anonbib</a></td>
413 413
         <td>Website</td>
414 414
         <td>Python</td>
... ...
@@ -610,9 +610,7 @@ meetings around the world.</li>
610 610
     </p>
611 611
 
612 612
     <a id="project-torcloud"></a>
613
-    <h3><a href="https://cloud.torproject.org/">Tor cloud</a> (<a
614
-    href="">code</a>, <a
615
-    href="">bug tracker</a>)</h3>
613
+    <h3><a href="https://cloud.torproject.org/">Tor cloud</a></h3>
616 614
 
617 615
     <p>
618 616
     Tor cloud
... ...
@@ -621,6 +619,7 @@ meetings around the world.</li>
621 619
     <a id="project-torouter"></a>
622 620
     <h3><a
623 621
     href="<wiki>doc/Torouter">Torouter</a> (<a
622
+    href="https://gitweb.torproject.org/torouter.git">code</a>, <a
624 623
     href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torouter&order=priority">bug
625 624
     tracker</a>)</h3>
626 625
 
... ...
@@ -665,13 +664,15 @@ meetings around the world.</li>
665 664
 
666 665
     <a id="project-obfsproxy"></a>
667 666
     <h3><a href="<page projects/obfsproxy>">Obfsproxy</a> (<a
668
-    href="https://gitweb.torproject.org/obfsproxy.git">code</a>, <a
667
+    href="https://gitweb.torproject.org/obfsproxy.git">C codebase</a>, <a
668
+    href="https://gitweb.torproject.org/user/asn/pyobfsproxy.git">python
669
+    codebase</a>, <a
669 670
     href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Pluggable+transport&order=priority">bug
670 671
     tracker</a>)</h3>
671 672
 
672 673
     <p>
673 674
     A proxy that shapes Tor traffic, making it harder for censors to detect and
674
-    block Tor.
675
+    block Tor. This has both a C and python implementation.
675 676
     </p>
676 677
 
677 678
     <!--
... ...
@@ -695,7 +696,7 @@ meetings around the world.</li>
695 696
     </p>
696 697
 
697 698
     <a id="project-brdgrd"></a>
698
-    <h3><a href="https://gitweb.torproject.org/brdgrd.git/blob/HEAD:/README">Flash Proxy</a> (<a
699
+    <h3><a href="https://gitweb.torproject.org/brdgrd.git/blob/HEAD:/README">bridge-guard</a> (<a
699 700
     href="https://gitweb.torproject.org/brdgrd.git/tree">code</a>)</h3>
700 701
 
701 702
     <p>
... ...
@@ -706,15 +707,16 @@ meetings around the world.</li>
706 707
 
707 708
     <a id="project-thandy"></a>
708 709
     <h3>Thandy (<a
709
-    href="http://freehaven.net/~arma/tuf-ccs2010.pdf">paper</a>, <a
710
-    href="http://google-opensource.blogspot.com/2009/03/thandy-secure-update-for-tor.html">blog
711
-    post</a>, <a href="https://gitweb.torproject.org/thandy.git">code</a>,
712
-<a href="https://www.updateframework.com/">related website</a>)</h3>
710
+    href="https://gitweb.torproject.org/thandy.git">code</a>)</h3>
713 711
 
714 712
     <p>
715
-    Updater for Tor. The project began in the Summer of 2008 but wasn't
716
-    completed. Recently interest in it has been rekindled and many aspects of
717
-    its design (including the language it'll be in) are currently in flux.
713
+    Updater for Tor. The project <a
714
+    href="http://google-opensource.blogspot.com/2009/03/thandy-secure-update-for-tor.html">began
715
+    in the Summer of 2008</a> but wasn't completed. Later interest in it was
716
+    rekindled and many aspects of <a
717
+    href="http://freehaven.net/~arma/tuf-ccs2010.pdf">its design</a> (including
718
+    the language it'll be in) are currently in flux. This is related to <a
719
+    href="https://www.updateframework.com/">TUF</a>.
718 720
     </p>
719 721
 
720 722
     <a id="project-shadow"></a>
... ...
@@ -730,20 +732,14 @@ meetings around the world.</li>
730 732
     </p>
731 733
 
732 734
     <a id="project-experimentor"></a>
733
-    <h3><a href="">ExperimenTor</a> (<a
734
-    href="">code</a>, <a
735
-    href="">bug
736
-    tracker</a>)</h3>
735
+    <h3>ExperimenTor</h3>
737 736
 
738 737
     <p>
739 738
     ExperimenTor
740 739
     </p>
741 740
 
742 741
     <a id="project-chutney"></a>
743
-    <h3><a href="">Chutney</a> (<a
744
-    href="">code</a>, <a
745
-    href="">bug
746
-    tracker</a>)</h3>
742
+    <h3>Chutney</h3>
747 743
 
748 744
     <p>
749 745
     Chutney
... ...
@@ -861,10 +857,7 @@ meetings around the world.</li>
861 857
     </p>
862 858
 
863 859
     <a id="project-torperf"></a>
864
-    <h3><a href="">Torperf</a> (<a
865
-    href="">code</a>, <a
866
-    href="">bug
867
-    tracker</a>)</h3>
860
+    <h3>Torperf</h3>
868 861
 
869 862
     <p>
870 863
     TorPerf
... ...
@@ -874,7 +867,7 @@ meetings around the world.</li>
874 867
     <h3><a href="<page projects/onionoo>">Onionoo</a> (<a
875 868
     href="https://gitweb.torproject.org/onionoo.git">java codebase</a>, <a
876 869
     href="https://gitweb.torproject.org/pyonionoo.git">python
877
-    codebase</a>)</h3>
870
+    codebase</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Onionoo&order=priority">bug tracker</a>)</h3>
878 871
 
879 872
     <p>
880 873
     Onionoo is a JSON based protocol to learn information about currently
881 874