Browse code

kill the dead project pages they should be on the wiki anyway, start desc about active projects, add torbutton to the makefile.

Andrew Lewman authored on07/10/2010 20:46:12
Showing13 changed files
... ...
@@ -23,7 +23,7 @@ export STABLETAG=tor-0.2.2.17-alpha
23 23
 export DEVTAG=tor-0.2.2.17-alpha
24 24
 
25 25
 WMLBASE=.
26
-SUBDIRS=docs eff projects press about download download getinvolved donate
26
+SUBDIRS=docs eff projects press about download getinvolved donate torbutton
27 27
 
28 28
 include $(WMLBASE)/Makefile.common
29 29
 all: $(SUBDIRS)
30 30
deleted file mode 100644
... ...
@@ -1,107 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 0 $
3
-# Translation-Priority: 3-low
4
-
5
-#include "head.wmi" TITLE="Tor Project: Client-side Projects" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
6
-<div id="content" class="clearfix">
7
-	<div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/clientside>">Client-side Projects</a>
11
-  </div>
12
-	<div id="maincol">
13
-  	<h1>Client-side Projects</h1>
14
-    <p>Consectetur adipiscing elit. Proin sit amet dolor justo, lacinia dapibus est. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In orci est, pellentesque sit amet consequat eget, venenatis id augue. Quisque arcu velit, ultricies non porta a, dictum in lorem. Quisque pulvinar laoreet fermentum. Quisque mauris nulla, lobortis non facilisis at, lacinia in diam. Sed at enim tortor, vitae consequat elit.</p>
15
-    <div class="featured-project focus left first">
16
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
17
-      <div class="name">Torbrowser</div>
18
-      <div class="caps">By Author</div>
19
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
20
-    </div>
21
-    <div class="featured-project focus left">
22
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
23
-      <div class="name">Torbutton</div>
24
-      <div class="caps">By Author</div>
25
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Integer semper justo mattis. <a href="<page torbutton/index>">Learn more &raquo;</a></p>
26
-    </div>
27
-    <table class="topforty">
28
-    	<tr>
29
-        <td class="beige">
30
-          <div class="name">Tordnsel</div>
31
-          <div class="caps">By Author</div>
32
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/tordnsel>">Learn more &raquo;</a></p>
33
-        </td>
34
-        <td>
35
-          <div class="name">Vidalia</div>
36
-          <div class="caps">By Author</div>
37
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/vidalia>">Learn more &raquo;</a></p>
38
-        </td>
39
-        <td class="beige">
40
-          <div class="name">Project Name</div>
41
-          <div class="caps">By Author</div>
42
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
43
-        </td>
44
-      </tr>
45
-      <tr>
46
-        <td>
47
-          <div class="name">Project Name</div>
48
-          <div class="caps">By Author</div>
49
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
50
-        </td>
51
-        <td class="beige">
52
-          <div class="name">Project Name</div>
53
-          <div class="caps">By Author</div>
54
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
55
-        </td>
56
-        <td>
57
-          <div class="name">Project Name</div>
58
-          <div class="caps">By Author</div>
59
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
60
-        </td>
61
-      </tr>
62
-      <tr>
63
-        <td class="beige">
64
-          <div class="name">Project Name</div>
65
-          <div class="caps">By Author</div>
66
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
67
-        </td>
68
-        <td>
69
-          <div class="name">Project Name</div>
70
-          <div class="caps">By Author</div>
71
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
72
-        </td>
73
-        <td class="beige">
74
-          <div class="name">Project Name</div>
75
-          <div class="caps">By Author</div>
76
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
77
-        </td>
78
-      </tr>
79
-      <tr>
80
-        <td>
81
-          <div class="name">Project Name</div>
82
-          <div class="caps">By Author</div>
83
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
84
-        </td>
85
-        <td class="beige">
86
-          <div class="name">Project Name</div>
87
-          <div class="caps">By Author</div>
88
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
89
-        </td>
90
-        <td>
91
-          <div class="name">Project Name</div>
92
-          <div class="caps">By Author</div>
93
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
94
-        </td>
95
-      </tr>
96
-    </table>
97
-    <!-- END TABLE -->
98
-  </div>
99
-  <!-- END MAINCOL -->
100
-  <div id = "sidecol">
101
-#include "side.wmi"
102
-#include "info.wmi"
103
-  </div>
104
-  <!-- END SIDECOL -->
105
-</div>
106
-<!-- END CONTENT -->
107
-#include <foot.wmi>   
108 0
deleted file mode 100644
... ...
@@ -1,89 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 21511 $
3
-# Translation-Priority: 4-optional
4
-
5
-#include "head.wmi" TITLE="Tor Project: Google Project: Secure Upgrade of Tor" CHARSET="UTF-8"
6
-<div id="content" class="clearfix">
7
-	<div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/google>">Google Project</a>
11
-  </div>
12
-	<div id="maincol"> 
13
-    <!-- PUT CONTENT AFTER THIS TAG -->
14
-    
15
-    <h2>Google Project:  Secure Upgrade of Tor</h2>
16
-    
17
-    <hr />
18
-    
19
-    <p>
20
-    
21
-    
22
-    </p>
23
-    
24
-    <p>
25
-    This project is generously funded by <a href="http://www.google.com">Google</a>.
26
-    </p>
27
-    
28
-    <a id="Timetable"></a>
29
-    <h2><a class="anchor" href="#Timetable">Timetable</a></h2>
30
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
31
-    <!-- <thead>
32
-    <tr bgcolor="#e5e5e5">
33
-    <th>Deliverable</th>
34
-    <th>Due Date</th>
35
-    </tr>
36
-    </thead> -->
37
-    
38
-    <tr bgcolor="#e5e5e5">
39
-      <td>
40
-        <b>Milestone 1:</b> Vidalia recognizes when Tor needs to upgrade,
41
-    and learns the most suitable new version and where to find it.<br />
42
-        <small><em>Looking at the majority-signed network status consensus
43
-    to decide when to update and to what version (Tor already lists what
44
-    versions are considered safe, in each network status
45
-    document)</em></small>
46
-      </td>
47
-      <td>
48
-        November 15, 2008
49
-      </td>
50
-    </tr>
51
-    
52
-    <tr>
53
-      <td>
54
-        <b>Milestone 2:</b>Vidalia can fetch a new version of Tor from the
55
-    Tor website and check its signature.<br />  
56
-        <small><em>Update either via Tor or via the directory
57
-    mirror update protocol (proposal 127) when possible, for additional
58
-    privacy.   Check package signatures to ensure package validity.</em></small>
59
-      </td>
60
-      <td>
61
-        November 15, 2008
62
-      </td>
63
-    </tr>
64
-    
65
-    <tr bgcolor="#e5e5e5">
66
-      <td>
67
-        <b>Milestone 3:</b> Vidalia has an interface for notifying the user
68
-    about upgrades and helping them upgrade. <br /> 
69
-        <small><em>Give the user an interface for these updates, including
70
-    letting her opt to migrate from one major Tor version to the next. 
71
-        </em></small>
72
-      </td>
73
-      <td>
74
-        November 15, 2008
75
-      </td>
76
-    </tr>
77
-    </table>
78
-    
79
-    <br />
80
-  </div>
81
-  <!-- END MAINCOL -->
82
-  <div id = "sidecol">
83
-#include "side.wmi"
84
-#include "info.wmi"
85
-  </div>
86
-  <!-- END SIDECOL -->
87
-</div>
88
-<!-- END CONTENT -->
89
-#include <foot.wmi>    
90 0
deleted file mode 100644
... ...
@@ -1,133 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 12809 $
3
-
4
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
-<div id="content" class="clearfix">
6
-	<div id="breadcrumbs">
7
-    <a href="<page index>">Home &raquo; </a>
8
-    <a href="<page projects/projects>">Projects &raquo; </a>
9
-    <a href="<page projects/projects>">Gui Competition</a>
10
-  </div>
11
-    
12
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
13
-    <div class="guileft">
14
-    <div class="guimenu">
15
-      
16
-      <div class="curveleft">
17
-      <div class="curveright">
18
-      &nbsp;
19
-      </div>
20
-      </div>
21
-    
22
-    <div class="guimenuinner">
23
-    <h1>Tor GUI Competition</h1>
24
-    
25
-    <a href="index.html">Overview &amp; Goals</a>
26
-    <a class="on" href="categories.html">What to Submit</a>
27
-    <a href="submit.html">How to Submit</a>
28
-    <a href="criteria.html">Judging &amp; Timeline</a>
29
-    <a href="technotes.html">Technical Notes</a>
30
-    <a href="legal.html">Licensing</a>
31
-    <h1>&nbsp;</h1>
32
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
33
-    </div>
34
-    
35
-      <div class="curvebottomleft">
36
-      <div class="curvebottomright">
37
-      &nbsp;
38
-      </div>
39
-      </div>
40
-    
41
-    </div>
42
-    </div>
43
-    
44
-    <h2>Categories</h2>
45
-    <p>
46
-    The design competition will proceed in two phases: first sketches and then
47
-    working code. You are invited to submit to either phase, or both phases.
48
-    For each phase, our panel of judges will recognize the
49
-    best submissions.
50
-    </p>
51
-    
52
-    <p>
53
-    All qualifying entries will receive an <a
54
-    href="https://www.torproject.org/tshirt.html">EFF Tor T-shirt</a>
55
-    (subject to availability). The best sketches and working implementations
56
-    will be published on the Tor website.
57
-    </p>
58
-    
59
-    <p><b>Sketches:</b>
60
-    the goal of this phase is to produce a mock-up of a functioning interface.
61
-    This should include design documents describing how the interface should
62
-    function. If you want, it should also include graphical elements that
63
-    can be used by programmers.
64
-    </p>
65
-    
66
-    <p>
67
-    A qualifying sketch will present an informal specification for a
68
-    design. That is, it will present with some degree of thoroughness all
69
-    of the major interfaces that we might expect to encounter, all of the
70
-    major functionality for the interface, and a reasonable story about
71
-    how it would be integrated into currently-existing tools (if, indeed,
72
-    it would be). One example, with more detail than we would require, is
73
-    <a href="http://ui.netbeans.org/docs/ui/junits/promo_f.html">the NetBeans
74
-    UI for JUnit</a>. Note that it walks through multiple interfaces,
75
-    highlighting the features and functions of the various buttons.
76
-    </p>
77
-    
78
-    <ul>
79
-    <li><b>Most featureful interface</b> will be awarded to the graphic design
80
-    that would provide usable, clear access to the most aspects of the Tor
81
-    system, covering many or most of the categories on the "useful features"
82
-    list.</li>
83
-    <li><b>Most usable experience</b> will be awarded to the graphic
84
-    design that would provide the most unobtrusive Tor experience while still
85
-    covering all criteria (working, perhaps, on the "no news is good news"
86
-    theory).</li>
87
-    <li><b>Clearest implementation guidance</b> will be awarded to the
88
-    graphic design that provides the cleanest package of graphic elements
89
-    and design documentation to aid would-be implementers.</li>
90
-    </ul>
91
-    
92
-    <p><b>Code:</b> the goal of this phase is to produce a working
93
-    implementation. You may use any of the sketches, graphics, or ideas from
94
-    the <a
95
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestEntries">first
96
-    phase</a> (with appropriate credit to their authors), or you can make
97
-    your own. See the <a
98
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestSamples">Competition
99
-    Samples</a> wiki page for some other images you can reuse.
100
-    </p>
101
-    
102
-    <p>
103
-    An acceptable entry will be a package of free software that builds and
104
-    runs. It can be a stand-alone application, or it can act as an extension
105
-    or plugin to other broadly-available free software. The entry will
106
-    demonstrate the points in the Goals section: that is, it will be able
107
-    to control, display, and maintain awareness as discussed above.
108
-    </p>
109
-    
110
-    <ul>
111
-    <li><b>Most featureful interface</b> will be awarded to the application
112
-    that provides usable, clear access to the most aspects of the Tor system,
113
-    covering many or most of the categories on the "additional" list.</li>
114
-    <li><b>Most usable experience</b> will be awarded to the
115
-    application that provides the most unobtrusive Tor experience while
116
-    still covering all criteria (working, perhaps, on the "no news is good
117
-    news" theory).</li>
118
-    <li><b>Most flexible</b> will be awarded to the best system that runs
119
-    smoothly on all three of Windows, Linux, and OS&nbsp;X; extra points will be
120
-    awarded for additional systems.</li>
121
-    </ul>
122
-    
123
-    <p>We reserve the right to award other awards as the entries deserve.</p>
124
-  </div>
125
-  <!-- END MAINCOL -->
126
-  <div id = "sidecol">
127
-#include "side.wmi"
128
-#include "info.wmi"
129
-  </div>
130
-  <!-- END SIDECOL -->
131
-</div>
132
-<!-- END CONTENT -->
133
-#include <foot.wmi>       
134 0
deleted file mode 100644
... ...
@@ -1,99 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 12809 $
3
-
4
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
-<div id="content" class="clearfix">
6
-	<div id="breadcrumbs">
7
-    <a href="<page index>">Home &raquo; </a>
8
-    <a href="<page projects/projects>">Projects &raquo; </a>
9
-    <a href="<page projects/gui-criteria>">GUI Criteria</a>
10
-  </div>
11
-	<div id="maincol">  
12
-    
13
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
14
-    <div class="guileft">
15
-    <div class="guimenu">
16
-      
17
-      <div class="curveleft">
18
-      <div class="curveright">
19
-      &nbsp;
20
-      </div>
21
-      </div>
22
-    
23
-    <div class="guimenuinner">
24
-    <h1>Tor GUI Competition</h1>
25
-    
26
-    <a href="index.html">Overview &amp; Goals</a>
27
-    <a href="categories.html">What to Submit</a>
28
-    <a href="submit.html">How to Submit</a>
29
-    <a class="on" href="criteria.html">Judging &amp; Timeline</a>
30
-    <a href="technotes.html">Technical Notes</a>
31
-    <a href="legal.html">Licensing</a>
32
-    <h1>&nbsp;</h1>
33
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
34
-    </div>
35
-    
36
-      <div class="curvebottomleft">
37
-      <div class="curvebottomright">
38
-      &nbsp;
39
-      </div>
40
-      </div>
41
-    
42
-    </div>
43
-    </div>
44
-    
45
-    <h2>Criteria</h2>
46
-    
47
-    <p>Awards will be granted on the basis of (in rough preference order):</p>
48
-    
49
-    <ul>
50
-    <li>Usability (<a
51
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ#DefineUsable">what
52
-    does this mean?</a>)</li>
53
-    <li>Informativeness: can the user learn what they need to know, both in terms
54
-    of using the network and also in terms of security decisions?</li>
55
-    <li>Total user experience</li>
56
-    <li>Aesthetics</li>
57
-    <li>Responsiveness</li>
58
-    <li>Stability and robustness</li>
59
-    <li>Internationalization (multiple language support)</li>
60
-    <li>Installation experience</li>
61
-    </ul>
62
-    <br />
63
-    <h2>Judges</h2>
64
-    
65
-    <p>Judging will be led by a panel of prominent specialists in usability
66
-    and security, including:</p>
67
-    <ul>
68
-    <li>Patrick Ball, Director, Human Rights Program, The Benetech
69
-    Initiative</li>
70
-    <li>Ren Bucholz, EFF</li>
71
-    <!--<li>Simson Garfinkel, Center for Research on Computation and Society,
72
-    Harvard University</li>-->
73
-    <li>Bruce Schneier, Counterpane Internet Security</li>
74
-    <li>Adam Shostack, Informed Security</li>
75
-    <li>Edward Tufte</li>
76
-    <li>Ka-Ping Yee, University of California, Berkeley</li>
77
-    </ul>
78
-    
79
-    <h2>Timeline</h2>
80
-    
81
-    <ul>
82
-    <li>Phase 1 deadline (sketches): November 30, 2005.</li>
83
-    <li>Phase 2 deadline (code): May 31, 2006.</li>
84
-    </ul>
85
-    
86
-    <p>Winners will be announced on the webpage and also at the SOUPS 2006
87
-    conference. (Here's a suggestion on one approach to <a
88
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ#AcademicResearch">academic
89
-    usability research on Tor</a>.)</p>
90
-  </div>
91
-  <!-- END MAINCOL -->
92
-  <div id = "sidecol">
93
-#include "side.wmi"
94
-#include "info.wmi"
95
-  </div>
96
-  <!-- END SIDECOL -->
97
-</div>
98
-<!-- END CONTENT -->
99
-#include <foot.wmi>       
100 0
deleted file mode 100644
... ...
@@ -1,80 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 12809 $
3
-
4
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
-<div id="content" class="clearfix">
6
-	<div id="breadcrumbs">
7
-    <a href="<page index>">Home &raquo; </a>
8
-    <a href="<page projects/projects>">Projects &raquo; </a>
9
-    <a href="<page projects/gui-legal>">GUI Legal</a>
10
-  </div>
11
-	<div id="maincol">  
12
-    
13
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
14
-    <div class="guileft">
15
-    <div class="guimenu">
16
-      
17
-      <div class="curveleft">
18
-      <div class="curveright">
19
-      &nbsp;
20
-      </div>
21
-      </div>
22
-    
23
-    <div class="guimenuinner">
24
-    <h1>Tor GUI Competition</h1>
25
-    
26
-    
27
-    <a href="index.html">Overview &amp; Goals</a>
28
-    <a href="categories.html">What to Submit</a>
29
-    <a href="submit.html">How to Submit</a>
30
-    <a href="criteria.html">Judging &amp; Timeline</a>
31
-    <a href="technotes.html">Technical Notes</a>
32
-    <a class="on" href="legal.html">Licensing</a>
33
-    <h1>&nbsp;</h1>
34
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
35
-    </div>
36
-    
37
-      <div class="curvebottomleft">
38
-      <div class="curvebottomright">
39
-      &nbsp;
40
-      </div>
41
-      </div>
42
-    
43
-    </div>
44
-    </div>
45
-    
46
-    <h2>Legal Notes</h2>
47
-    
48
-    <p>By submitting your entry to be considered in the Tor GUI competition, you
49
-    hereby:</p>
50
-    <p>
51
-    <b>(A)</b> represent and warrant that (1) the entry was created by you and
52
-    that you own all rights to the entry or have the authorized rights to
53
-    submit such entry and grant the licenses below; and (2) that the
54
-    entry does not infringe on any third party copyright or other
55
-    intellectual property rights; AND
56
-    </p><p>
57
-    <b>(B)</b> EITHER (1) grant us a worldwide, royalty-free, non-exclusive,
58
-    perpetual license to reproduce, edit, perform, display, publish, make
59
-    derivative works, and otherwise use the entry as we see fit,
60
-    including without limitation, incorporating (in whole or in part)
61
-    into the Tor software, and to sublicense such rights; OR, (2)
62
-    provide the entry pursuant to a license that complies with the
63
-    <a href="http://www.opensource.org/docs/definition.php">Open
64
-    Source Definition</a>, such as the 3-clause BSD, MIT, or
65
-    GPL licenses, or (where applicable) provide the entry licensed under
66
-    the <a href="http://creativecommons.org/licenses/by/2.5/">Creative
67
-    Commons Attribution</a> license. If you provide the entry pursuant to
68
-    such a license, you must include the applicable information in your
69
-    submission.
70
-    </p>
71
-  </div>
72
-  <!-- END MAINCOL -->
73
-  <div id = "sidecol">
74
-#include "side.wmi"
75
-#include "info.wmi"
76
-  </div>
77
-  <!-- END SIDECOL -->
78
-</div>
79
-<!-- END CONTENT -->
80
-#include <foot.wmi>       
81 0
deleted file mode 100644
... ...
@@ -1,91 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 12809 $
3
-
4
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
-<div id="content" class="clearfix">
6
-	<div id="breadcrumbs">
7
-    <a href="<page index>">Home &raquo; </a>
8
-    <a href="<page projects/projects>">Projects &raquo; </a>
9
-    <a href="<page projects/projects>">GUI Submit</a>
10
-  </div>
11
-	<div id="maincol">  
12
-
13
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
14
-    <div class="guileft">
15
-    <div class="guimenu">
16
-      
17
-      <div class="curveleft">
18
-      <div class="curveright">
19
-      &nbsp;
20
-      </div>
21
-      </div>
22
-    
23
-    <div class="guimenuinner">
24
-    <h1>Tor GUI Competition</h1>
25
-    
26
-    
27
-    <a href="index.html">Overview &amp; Goals</a>
28
-    <a href="categories.html">What to Submit</a>
29
-    <a class="on" href="submit.html">How to Submit</a>
30
-    <a href="criteria.html">Judging &amp; Timeline</a>
31
-    <a href="technotes.html">Technical Notes</a>
32
-    <a href="legal.html">Licensing</a>
33
-    <h1>&nbsp;</h1>
34
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
35
-    </div>
36
-    
37
-      <div class="curvebottomleft">
38
-      <div class="curvebottomright">
39
-      &nbsp;
40
-      </div>
41
-      </div>
42
-    
43
-    </div>
44
-    </div>
45
-    
46
-    <h2>How to Submit an Entry</h2>
47
-    
48
-    <p>Submissions for phase one (sketches) should come as:</p>
49
-    <ul>
50
-    <li>Images in an html page. The images must be able to be viewed on an
51
-    ordinary browser, e.g. Firefox. (You can submit proprietary formats too,
52
-    but if you do then you need to also export them to something we can
53
-    all read.) Must be licensed under a <a href="legal.html">free license</a>.</li>
54
-    <li>A design document (txt, html, pdf, or ps) as described in the
55
-    <a href="categories.html">Submission Categories</a> section.</li>
56
-    </ul>
57
-    
58
-    <p>Submissions for phase two (code) should come as:</p>
59
-    
60
-    <ul>
61
-    <li>Source code, with appropriate makefiles or documentation explaining
62
-    how to build it. Must be licensed under a free/open source license, as
63
-    defined by <a href="http://www.opensource.org/licenses/">OSI</a>. See <a
64
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ#DefineFree">this
65
-    FAQ entry</a> for clarification.</li>
66
-    <li>Compiled binaries or bytecodes for at least one platform of choice.</li>
67
-    <li>A design document (txt, html, pdf, or ps) providing an overview of
68
-    what major functions to look for and what functions are implemented.</li>
69
-    </ul>
70
-    
71
-    <p>To submit your entry, make a web page with
72
-    all your materials on it, then add a line to <a
73
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestEntries">The
74
-    GUI Competition Entries Wiki</a>. (If you don't have a web page of
75
-    your own to put your entry on, find a friend who does, or mail <a
76
-    href="mailto:tor-gui@freehaven.net">tor-gui@freehaven.net</a> and we'll
77
-    put it up on a temporary page.</p>
78
-    
79
-    <p>If you put it up on your own site, you can continue to update and
80
-    modify it. Remember that submitting early means you can get feedback
81
-    from Tor users and make it into a better submission!</p>
82
-  </div>
83
-  <!-- END MAINCOL -->
84
-  <div id = "sidecol">
85
-#include "side.wmi"
86
-#include "info.wmi"
87
-  </div>
88
-  <!-- END SIDECOL -->
89
-</div>
90
-<!-- END CONTENT -->
91
-#include <foot.wmi>       
92 0
deleted file mode 100644
... ...
@@ -1,78 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 21421 $
3
-
4
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
-<div id="content" class="clearfix">
6
-	<div id="breadcrumbs">
7
-    <a href="<page index>">Home &raquo; </a>
8
-    <a href="<page projects/projects>">Projects &raquo; </a>
9
-    <a href="<page projects/gui-technotes>">GUI Technical Notes</a>
10
-  </div>
11
-	<div id="maincol">  
12
-
13
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
14
-    <div class="guileft">
15
-    <div class="guimenu">
16
-      
17
-      <div class="curveleft">
18
-      <div class="curveright">
19
-      &nbsp;
20
-      </div>
21
-      </div>
22
-    
23
-    <div class="guimenuinner">
24
-    <h1>Tor GUI Competition</h1>
25
-    
26
-    
27
-    <a href="index.html">Overview &amp; Goals</a>
28
-    <a href="categories.html">What to Submit</a>
29
-    <a href="submit.html">How to Submit</a>
30
-    <a href="criteria.html">Judging &amp; Timeline</a>
31
-    <a class="on" href="technotes.html">Technical Notes</a>
32
-    <a href="legal.html">Licensing</a>
33
-    <h1>&nbsp;</h1>
34
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
35
-    </div>
36
-    
37
-      <div class="curvebottomleft">
38
-      <div class="curvebottomright">
39
-      &nbsp;
40
-      </div>
41
-      </div>
42
-    
43
-    </div>
44
-    </div>
45
-    
46
-    <h2>Technical Notes</h2>
47
-    
48
-    
49
-    <p>For phase two, the canonical version of Tor is going to be the
50
-    upcoming 0.1.1.x release. This is the version that will be used for
51
-    judging the competition; please ensure that you use this version. Bugfixes
52
-    to this version of Tor will be announced on the
53
-    <a href="<page download/download>">Tor download page</a>.
54
-    Let us know if you find bugs!
55
-    </p>
56
-    
57
-    <p>You may find the <a href="<gitblob>doc/control-spec.txt">Tor controller
58
-    specification</a> or the <a
59
-    href="https://svn.torproject.org/svn/torctl/trunk/doc/howto.txt">Tor
60
-    controller howto</a> helpful.
61
-    </p>
62
-    
63
-    <p>The Tor developers will also release test rigs (libraries) in both Java
64
-    and Python that demonstrate Tor's controller protocol. Code submissions
65
-    may be able to save a lot of time by using this code as a skeleton. You
66
-    can check out the <a href="https://svn.torproject.org/svn/torctl/trunk/">development
67
-    versions of these libraries</a> now. Let us know if you find bugs!
68
-    </p>
69
-  </div>
70
-  <!-- END MAINCOL -->
71
-  <div id = "sidecol">
72
-#include "side.wmi"
73
-#include "info.wmi"
74
-  </div>
75
-  <!-- END SIDECOL -->
76
-</div>
77
-<!-- END CONTENT -->
78
-#include <foot.wmi>       
79 0
deleted file mode 100644
... ...
@@ -1,475 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 21511 $
3
-# Translation-Priority: 4-optional
4
-
5
-#include "head.wmi" TITLE="Tor Project: NLnet Project: Speed Up Tor Hidden Services" CHARSET="UTF-8"
6
-<div id="content" class="clearfix">
7
-	<div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/hidserv>">NLnet Project</a>
11
-  </div>
12
-	<div id="maincol"> 
13
-    <!-- PUT CONTENT AFTER THIS TAG -->
14
-    
15
-    <h2>NLnet Project: Speed Up Tor Hidden Services</h2>
16
-    <hr />
17
-    
18
-    <p>
19
-    Tor Hidden Services allow users to set up anonymous information services,
20
-    like websites, that can only be accessed through the Tor network and are
21
-    protected against identification of the host that runs the services.
22
-    The most critical limitations of Tor Hidden Services are the time it takes
23
-    until a Hidden Service is registered in the network and the latency of
24
-    contact establishment when accessed by a user.
25
-    Due to design issues in the original Tor protocol,
26
-    the connection to a new Hidden Service can take several minutes, which
27
-    leads most users to give up before the connection has been established.
28
-    Using Tor Hidden Services for direct interactive user-to-user
29
-    communication (e.g. messaging) is nearly impossible due to the high latency
30
-    of Hidden Service circuit setup.
31
-    </p>
32
-    
33
-    <p>
34
-    This project aims at speeding up Tor Hidden Services by improving the way
35
-    Tor circuits are set up between the user and the Hidden Service as well as
36
-    the way a Hidden Service is registered in the Tor network.
37
-    In a first step precise diagnostics of the behavior of the Hidden Services
38
-    in lab setups and real world situations will be conducted to find the
39
-    root causes of the bad timing effects.
40
-    Based on these diagnostics, optimization strategies will be designed and
41
-    verified for unwanted implications for the security and anonymity of the
42
-    Tor network.
43
-    The most promising optimizations will then be implemented to achieve a
44
-    notable improvement for the users. Precise success metrics will be
45
-    developed in the diagnostics phase, after it becomes clear where the time
46
-    is lost and what improvements are realistic.
47
-    The ultimate goal is to have the Hidden Services protocol change production
48
-    ready and propagated to the Tor users within a timeframe of less than
49
-    12 months.
50
-    </p>
51
-    
52
-    <p>
53
-    This project is generously funded by:
54
-    </p>
55
-    
56
-    <p>
57
-    <a href="http://www.nlnet.nl/news/2008/20080514-awards.html">
58
-    <img src="$(IMGROOT)/nlnet-160x60.png" alt="The NLnet foundation" /></a>
59
-    </p>
60
-    
61
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
62
-    <thead>
63
-    <tr>
64
-    <th><big>Project</big></th>
65
-    <th><big>Due Date</big></th>
66
-    </tr>
67
-    </thead>
68
-    
69
-    <tr bgcolor="#e5e5e5">
70
-      <td>
71
-        <b>Deliverable A:</b> Analysis, measurements and problem
72
-        clarification<br />
73
-        <small><em>As Tor Hidden Services have not been actively developed
74
-        further in the last year or so of Tor development, certain aspects of
75
-        the problems are under-diagnosed. To identify the precise sources of
76
-        latency and time loss, an extensive analysis of the deeper reasons for
77
-        them needs to be conducted. Deliverable A will require about one month
78
-        of work. The results of the analysis will influence the design
79
-        decisions to be taken in Deliverable B.</em></small>
80
-      </td>
81
-      <td>
82
-        June 15, 2008
83
-      </td>
84
-    </tr>
85
-    
86
-    <tr>
87
-      <td>
88
-        <b>Deliverable B:</b> Design and evaluation of the necessary
89
-        changes<br />
90
-        <small><em>The changes to Tor Hidden Services will affect core
91
-        functionality of the protocol and therefore require a careful
92
-        evaluation of possible repercussions for the security and anonymity. A
93
-        two-month period is planned for the design and evaluation phase, which
94
-        concludes with an extensive peer review.</em></small>
95
-      </td>
96
-      <td>
97
-        August 15, 2008
98
-      </td>
99
-    </tr>
100
-    
101
-    <tr bgcolor="#e5e5e5">
102
-      <td>
103
-        <b>Deliverable C:</b> Implementation<br />
104
-        <small><em>After design, evaluation and peer review the modifications
105
-        need to be implemented and integrated with the current Tor code base.
106
-        The actual implementation of the necessary changes will take
107
-        approximately two months.</em></small>
108
-      </td>
109
-      <td>
110
-        October 15, 2008
111
-      </td>
112
-    </tr>
113
-    
114
-    <tr>
115
-      <td>
116
-        <b>Deliverable D:</b> Implementation and test of the change up to
117
-        release state<br />
118
-        <small><em>The modification is highly critical to the security and
119
-        anonymity of the Tor network, it requires extensive testing and
120
-        debugging in laboratory and real life conditions. A period of three
121
-        months is projected for testing and debugging, where the responsible
122
-        developer is committed to the testing effort with 1/3 of its time. Part
123
-        of the testing phase will be a public beta period.</em></small>
124
-      </td>
125
-      <td>
126
-        January 15, 2009
127
-      </td>
128
-    </tr>
129
-    
130
-    <tr bgcolor="#e5e5e5">
131
-      <td>
132
-        <b>Deliverable E:</b> Rollout<br />
133
-        <small><em>The actual rollout to the Tor server network will be
134
-        conducted in sync with the regular Tor release schedule. As this
135
-        schedule is dependent on a number of external factors, like the
136
-        completion of other software projects that should go into the same
137
-        release, the actual release time and the time until this release has
138
-        been accepted and installed by most Tor server operators can vary. From
139
-        experience a period of three to four months can be
140
-        expected.</em></small>
141
-      </td>
142
-      <td>
143
-        May 15, 2009
144
-      </td>
145
-    </tr>
146
-    </table>
147
-    
148
-    <br />
149
-    
150
-    <a id="Reports"></a>
151
-    <h2><a class="anchor" href="#Reports">Monthly Status Reports</a></h2>
152
-    <p>
153
-    There will be in total eight monthly status reports beginning with the
154
-    first deliverable on June 15, 2008 and ending with completion of
155
-    implementation and testing work on January 15, 2009.
156
-    </p>
157
-    
158
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
159
-    <thead>
160
-    <tr>
161
-    <th><big>Month,</big></th>
162
-    <th><big>Status Report</big></th>
163
-    </tr>
164
-    </thead>
165
-    
166
-    <tr bgcolor="#e5e5e5">
167
-      <td>
168
-        <a id="Jun08"></a>
169
-        <a class="anchor" href="#Jun08">Jun 08</a>
170
-      </td>
171
-      <td>
172
-        <small><em>The original goal of analyzing the problems that lead to
173
-        slowdown of Tor Hidden Services has been accomplished. Part of this
174
-        analysis was measuring the delay that a user experiences when
175
-        setting up or accessing a hidden service. Furthermore, measurement data
176
-        from April 2008 could be leveraged to explore timings of internal
177
-        substeps of establishing a connection to a hidden service. The results
178
-        of this analysis are contained in a 22-page
179
-        <a href="http://freehaven.net/~karsten/hidserv/perfanalysis-2008-06-15.pdf">report</a>
180
-        that has been made public on the Tor
181
-        <a href="http://archives.seul.org/or/dev/Jun-2008/msg00019.html">developer
182
-        mailing list</a>.</em></small>
183
-        <br/>
184
-        <small><em>The analysis also unveiled a few bugs which were responsible
185
-        for part of the delay in making a hidden service available for
186
-        clients. Some bugs have been fixed subsequent to the analysis, others
187
-        will be fixed soon. The evaluation has further brought up several
188
-        possible approaches to improve Tor Hidden Service performance. Some of
189
-        these ideas can be applied immediately, while others require deeper
190
-        analysis and new measurements. Finally, in the course of the analysis,
191
-        we discovered that some improvements require more in-depth
192
-        changes to Tor which are not directly related to hidden services. These
193
-        changes cannot be achieved in the time frame of this
194
-        project.</em></small>
195
-      </td>
196
-    </tr>
197
-    
198
-    <tr>
199
-      <td>
200
-        <a id="Jul08"></a>
201
-        <a class="anchor" href="#Jul08">Jul 08</a>
202
-      </td>
203
-      <td>
204
-        <small><em>All bugs that have been found in the analysis have been
205
-        fixed. This includes the 2 bugs that have already been fixed during the
206
-        analysis and 4 more bugs that were fixed within the past 30 days. While
207
-        the bugfixes remove unintended performance bottlenecks due to
208
-        programming errors, some of the design changes that have been spotted
209
-        in the previous analysis have side-effects on anonymity or overall
210
-        network load which need to be evaluated against individual performance
211
-        gains. A <a href="http://freehaven.net/~karsten/hidserv/discussion-2008-07-15.pdf">report</a>
212
-        has been published to the
213
-        <a href="http://archives.seul.org/or/dev/Jul-2008/msg00034.html">developer
214
-        mailing list</a> including 7 possible design changes that need to be
215
-        discussed. Some evaluations (namely Low-Bandwidth Measurements and the
216
-        Grand Scaling Plan) have turned out to require more time than expected
217
-        and had to be scheduled for a later time in the project than
218
-        deliverable B. The current plan is to perform these evaluations within
219
-        the timeframe until January 15 and work with assumptions until final
220
-        results are available.</em></small>
221
-      </td>
222
-    </tr>
223
-    
224
-    <tr bgcolor="#e5e5e5">
225
-      <td>
226
-        <a id="Aug08"></a>
227
-        <a class="anchor" href="#Aug08">Aug 08</a>
228
-      </td>
229
-      <td>
230
-        <small><em>During the past 30 days the 7 proposed designs have been
231
-        further evaluated and discussed. Four of them have proven to be
232
-        applicable in terms of the required changes to the code and possible
233
-        anonymity implications. One has been classified as bug rather than
234
-        design change. Two had to be excluded for either unforeseeable security
235
-        problems, or uncertainty of actual performance
236
-        improvements.</em></small>
237
-        <br/>
238
-        <small><em>Together with the results from July 15, the design phase has
239
-        been concluded. The tasks for the upcoming implementation phase are now
240
-        quite clear: One bug needs to be fixed and four design changes need to
241
-        be implemented. Further, evaluations of the changed design need to be
242
-        performed in order to verify their usefulness. A
243
-        <a href="http://freehaven.net/~karsten/hidserv/design-2008-08-15.pdf">report</a>
244
-        with the results of the design phase has been published to the
245
-        <a href="http://archives.seul.org/or/dev/Aug-2008/msg00025.html">developer
246
-        mailing list</a>.</em></small>
247
-      </td>
248
-    </tr>
249
-    
250
-    <tr>
251
-      <td>
252
-        <a id="Sep08"></a>
253
-        <a class="anchor" href="#Sep08">Sep 08</a>
254
-      </td>
255
-      <td>
256
-        <small><em>During the first half of the implementation phase two bugs
257
-        could be fixed that were related to hidden services: the
258
-        <a href="http://bugs.noreply.org/flyspray/index.php?do=details&amp;id=767">first
259
-        bug</a> has already been identified in the design phase and was
260
-        responsible for an unusual high failure rate when making a hidden
261
-        service available in the system; the
262
-        <a href="http://bugs.noreply.org/flyspray/index.php?id=814&amp;do=details">second
263
-        bug</a> was found during the implementation phase and was responsible
264
-        for failure to connect to a working hidden service. Both bugfixes will
265
-        be included in the next unstable version and likely be backported to
266
-        one of the next stable releases.</em></small>
267
-        <br/>
268
-        <small><em>The four design changes that were proposed as result of the
269
-        design phase have been implemented in an
270
-        <a href="https://tor-svn.freehaven.net/svn/tor/branches/hidserv-design-changes/">experimental
271
-        branch</a> of the unstable development tree. Early function tests have
272
-        shown that these changes work and provide better (perceived)
273
-        performance. This needs to be confirmed throughout the next four weeks
274
-        in internal tests. The next goal is to prepare a release of this
275
-        experimental branch that can be given out to beta testers at the
276
-        beginning of the upcoming testing phase.</em></small>
277
-      </td>
278
-    </tr>
279
-    
280
-    <tr bgcolor="#e5e5e5">
281
-      <td>
282
-        <a id="Oct08"></a>
283
-        <a class="anchor" href="#Oct08">Oct 08</a>
284
-      </td>
285
-      <td>
286
-        <small><em>The implementation phase has been concluded. The bugfixes
287
-        that were found in the past 30 days have been released in developer
288
-        version <a href="http://archives.seul.org/or/talk/Oct-2008/msg00093.html">0.2.1.6-alpha</a>.
289
-        The four design changes that were identified in the design phase have
290
-        been specified in
291
-        <a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/155-four-hidden-service-improvements.txt">proposal 155</a>.
292
-        Three design changes have been included in the development codebase and
293
-        will automatically be included in the next development version. The
294
-        first two design changes improve connection establishment to a hidden
295
-        service by reducing a timeout from 60 to 30 seconds and by making a
296
-        second attempt in parallel after a delay of 15 seconds. The third
297
-        design change affects publication of a hidden service in the network by
298
-        advertising the service at 5 rather than 3 points in the network in
299
-        parallel and succeeding as soon as 3 points are established. The fourth
300
-        design change has turned out to be rather ineffective, but would add
301
-        considerable code complexity and was therefore dismissed. By now there
302
-        are no more open bugfixes or new designs. All changes are in the
303
-        development codebase and can be tested in the next phase.</em></small>
304
-      </td>
305
-    </tr>
306
-    
307
-    <tr>
308
-      <td>
309
-        <a id="Nov08"></a>
310
-        <a class="anchor" href="#Nov08">Nov 08</a>
311
-      </td>
312
-      <td>
313
-        <small><em>The performance improvements that were implemented in the
314
-        last phase have been released in Tor version 0.2.1.7-alpha. Users can
315
-        download this development version from the Tor homepage and test the
316
-        improvements with minimal effort. Further, two bugfixes (<a
317
-        href="http://bugs.noreply.org/flyspray/index.php?id=767&amp;do=details">1</a>,
318
-        <a href="http://bugs.noreply.org/flyspray/index.php?id=814&amp;do=details">2</a>)
319
-        that were found in the course of this project have been backported to
320
-        the stable branch and will be included with the next stable version
321
-        0.2.0.32.</em></small>
322
-        <br/>
323
-        <small><em>The main focus of the past 31 days was to perform new
324
-        measurements to see whether the improvements are effective or not.
325
-        Measurements were conducted for two days in the time of November 6th to
326
-        8th. Unfortunately, the Tor network suffered a serious problem in this
327
-        time: An expired directory authority certificate produced huge amounts
328
-        of traffic within the Tor network which <a
329
-        href="http://archives.seul.org/or/talk/Nov-2008/msg00053.html">forced
330
-        many operators to shut down their relays</a>. A second measurement was
331
-        performed between 13th and 15th. The raw data are available <a
332
-        href="http://freehaven.net/~karsten/hidserv/perfdata-2008-11-13.tar.gz">here</a>
333
-        (40 MB). But results show that the overall
334
-        network performance is still worse than in June 2008 when the first
335
-        hidden service measurements have been performed. This becomes visible
336
-        when comparing requests to the Tor directories which have not been
337
-        affected by the performance improvements and which exhibit
338
-        significantly worse performance than before. The effects of performance
339
-        improvements are visible, but absolute values are not comparable at
340
-        this time. New measurements will be conducted in December in the hope
341
-        that the effects of this problem have mitigated.</em></small>
342
-        <br/>
343
-        <small><em>Further, there might be a <a
344
-        href="http://bugs.noreply.org/flyspray/index.php?id=847&amp;do=details">bug</a>
345
-        in the way how Tor downloads directory information during
346
-        bootstrapping. Even though this is not related to hidden services, an
347
-        improvement would benefit hidden service publication, too. Part of the
348
-        work during the upcoming 30 days will be to investigate this bug.
349
-        </em></small>
350
-      </td>
351
-    </tr>
352
-    
353
-    <tr bgcolor="#e5e5e5">
354
-      <td>
355
-        <a id="Dec08"></a>
356
-        <a class="anchor" href="#Dec08">Dec 08</a>
357
-      </td>
358
-      <td>
359
-        <small><em>Part of the last 30 days has been used to fix bugs that have
360
-        influenced the previous hidden service measurements. The first <a
361
-        href="http://archives.seul.org/or/cvs/Nov-2008/msg00100.html">bugfix</a>
362
-        corrects a possible segmentation fault that was very likely responsible
363
-        for a number of failed measurement runs. Another <a
364
-        href="https://bugs.torproject.org/flyspray/index.php?id=847&amp;do=details">bug</a>
365
-        could be explained that lead to significant delays in bootstrapping:
366
-        Very slow directory authorities occupied bootstrapping clients for
367
-        a long time before clients finally gave up and bootstrapped using
368
-        another authority. As a result, the slowest two directory authorities
369
-        have dedicated more bandwidth to their nodes, so that the effect is
370
-        mitigated. A third <a
371
-        href="https://bugs.torproject.org/flyspray/index.php?id=874&amp;do=details">bug</a>
372
-        has been introduced with the hidden service performance improvements in
373
-        November; the effect was that Tor processes running hidden services
374
-        would stop advertising their service upon reloading their
375
-        configuration. Further, this bug has uncovered that Tor has
376
-        re-established its introduction points upon reloading, which might have
377
-        affected hidden service stability. This bug has been fixed and will be
378
-        included in the upcoming version 0.2.1.9-alpha.</em></small>
379
-        <br/>
380
-        <small><em>Apart from fixing bugs, new measurements have been performed
381
-        between December 8 and 10. These will very likely be the final
382
-        measurements to compare hidden service performance now with the
383
-        beginning of the project. The data have not been completely evaluated,
384
-        so it is difficult to make a statement about improvements at this
385
-        point. However, a <a
386
-        href="http://freehaven.net/~karsten/hidserv/prelimreport-2008-12-15.pdf">preliminary
387
-        evaluation</a> shows that service publication times have improved
388
-        significantly. This is a result of Tor clients bootstrapping faster and
389
-        of the performance improvements added in November. In contrast to this,
390
-        the results for establishing a connection to a hidden service are less
391
-        promising. While the improvements added in November seem to have a
392
-        positive effect on performance, some substeps exhibit significantly
393
-        worse performance. One example is fetching hidden service descriptors
394
-        in order to contact a hidden service. A possible explanation is that
395
-        the sudden increase in the number of hidden service directory nodes in
396
-        September has had a negative effect on performance. Part of the work in
397
-        the final 31 days will be to evaluate these data in more detail and
398
-        make a final conclusion on the achievements of this
399
-        project.</em></small>
400
-      </td>
401
-    </tr>
402
-    
403
-    <tr>
404
-      <td>
405
-        <a id="Jan09"></a>
406
-        <a class="anchor" href="#Jan09">Jan 09</a>
407
-      </td>
408
-      <td>
409
-        <small><em>The testing phase has been concluded. Testing was performed
410
-        in a public beta phase with all changes to hidden services being part
411
-        of the 0.2.1.x-alpha series. The result of the public beta phase is a
412
-        couple of identified bugs that could already be fixed.</em></small>
413
-        <br/>
414
-        <small><em>Another part of testing was a second set of measurements
415
-        that was performed in December. A
416
-        <a href="http://freehaven.net/~karsten/hidserv/comparison-2009-01-15.pdf">comparison</a>
417
-        of measurements performed in June and December has revealed that the
418
-        changes of this project are effective. Service publication times could
419
-        be more than halved from 2:12 minutes to 58 seconds in the mean. This
420
-        improvement is far better than expected. With this improvement it might
421
-        even be worthwile to think about reducing stabilization time from 30
422
-        seconds to a lower value in the future. However, connection
423
-        establishment remains at approximately 56 seconds between requesting a
424
-        hidden service to having established a connection to the hidden server.
425
-        The main reason for missing improvements is the switch from the
426
-        centralized to a decentralized storage for hidden service descriptors.
427
-        This deteriorating effect of distributing the hidden service directory
428
-        has not been expected before. Future work should focus on improving
429
-        downloads from the distributed hidden service directory, for example by
430
-        parallelizing requests.</em></small>
431
-        <br/>
432
-        <small><em>This report concludes the series of monthly status updates.
433
-        The rollout of the 0.2.1.x series including the hidden service
434
-        performance improvements is going to take place within the next weeks
435
-        to months.</em></small>
436
-      </td>
437
-    </tr>
438
-    </table>
439
-    
440
-    <br />
441
-    
442
-    <!-- Do we want a people section? If so, would it make sense to write what
443
-    these people will be doing? And what exactly are these people going to
444
-    do? :)
445
-    <a id="People"></a>
446
-    <h2><a class="anchor" href="#People">People</a></h2>
447
-    <ul>
448
-    <li><a href="<page about/people>#Core">Karsten Loesing</a></li>
449
-    <li><a href="<page about/people>#Core">Steven Murdoch</a></li>
450
-    </ul>
451
-    -->
452
-    
453
-    <a id="Links"></a>
454
-    <h2><a class="anchor" href="#Links">Links</a></h2>
455
-    <ul>
456
-    <li>Research paper on <b>Performance Measurements and Statistics of Tor
457
-    Hidden Services</b>
458
-    (<a href="http://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/loesing2008performance.pdf">PDF</a>)
459
-    by Karsten Loesing, Werner Sandmann, Christian Wilms, and Guido Wirtz. In
460
-    the Proceedings of the 2008 International Symposium on Applications and the
461
-    Internet (SAINT), Turku, Finland, July 2008.</li>
462
-    
463
-    <!-- In the future, put links to proposal, preliminary results, etc. here -->
464
-    
465
-    </ul>
466
-  </div>
467
-  <!-- END MAINCOL -->
468
-  <div id = "sidecol">
469
-#include "side.wmi"
470
-#include "info.wmi"
471
-  </div>
472
-  <!-- END SIDECOL -->
473
-</div>
474
-<!-- END CONTENT -->
475
-#include <foot.wmi>    
476 0
deleted file mode 100644
... ...
@@ -1,360 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 21511 $
3
-# Translation-Priority: 4-optional
4
-
5
-#include "head.wmi" TITLE="Tor Project: NLnet Project: Tor for Low Bandwidth Clients" CHARSET="UTF-8"
6
-<div id="content" class="clearfix">
7
-	<div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/lowbandwidth>">NLnet Project: Tor for Low Bandwidth Clients</a>
11
-  </div>
12
-	<div id="maincol"> 
13
-    <!-- PUT CONTENT AFTER THIS TAG -->
14
-    
15
-    <h2>NLnet Project: Tor for Low Bandwidth Clients</h2>
16
-    <hr />
17
-    
18
-    <p>
19
-    The Tor anonymity system is currently only usable by internet users who
20
-    have high-bandwidth connections. Upon the start of the Tor client, a large file
21
-    with all Tor server descriptions is being downloaded. This file is the so-called Tor
22
-    Directory and enables the client to choose from the available mix-servers in the Tor network. The
23
-    download of the full Tor Directory is required by the current Tor protocol. This directory
24
-    file is too large for users on modem lines or on mobile data networks like GPRS as the initial
25
-    download that is triggered every time an user logs in takes 10 to 30 minutes over a slow
26
-    line. As a result, Tor is not usable by modem and mobile users. One of the major goals of
27
-    the Tor project is to provide secure anonymous internet access to users in dictatorships
28
-    and repressive states. These locations often have very slow internet connections,
29
-    either by modem or due to low-bandwidth links to the outside world. By enabling these users to
30
-    use the Tor network, significant progress can be made towards free communication and
31
-    information in these countries.
32
-    </p>
33
-    
34
-    <p>
35
-    To make Tor usable also for users on low-bandwidth connections, an
36
-    evolution of the Tor protocol is needed to reduce the initial download size. This new Tor
37
-    protocol version should change the way a client receives the information for its Tor
38
-    circuit setup in a way, that the initial download can be performed over a 14.4 kbps modem line
39
-    in about three minutes. The work to be conducted under the proposal has the ultimate
40
-    goal of getting the protocol change production ready and propagated to the Tor users
41
-    within a timeframe of less then 12 months. The resulting software will be published under
42
-    the 3-Clause BSD license, as all of the Tor code. All deliverables will be fully public.
43
-    </p>
44
-    
45
-    <p>
46
-    This project is generously funded by:
47
-    </p>
48
-    
49
-    <p>
50
-    <a href="http://www.nlnet.nl/news/2008/20080514-awards.html">
51
-    <img src="$(IMGROOT)/nlnet-160x60.png" alt="The NLnet foundation" /></a>
52
-    </p>
53
-    
54
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
55
-    <thead>
56
-    <tr>
57
-    <th><big>Project</big></th>
58
-    <th><big>Due Date</big></th>
59
-    </tr>
60
-    </thead>
61
-    
62
-    <tr bgcolor="#e5e5e5">
63
-      <td>
64
-        <b>Deliverable A:</b> Design and evaluation of the protocol change<br />
65
-        <small><em>This deliverable covers the detailed design and
66
-        simulation-based evaluation of the necessary changes and design
67
-        modifications to the current Tor protocol.
68
-        The changes in protocol will be relatively substantial, so it requires a careful
69
-        evaluation of possible repercussions for the security and anonymity of the Tor network. A
70
-        two-month period is planned for this design and evaluation phase, which concludes with an
71
-        extensive peer review. Part of Deliverable A will be a goal definition for performance
72
-        for the implementation phase. The design goal is to shrink the Tor Directory
73
-        size that needs to be downloaded to about 300 Kilobytes, which would enable an user on a 14.4
74
-        kbps line to download it in roughly three minutes. There may be deviations from this
75
-        design goal if required to maintain anonymity and security, but this is the figure to aim for.
76
-        </em></small>
77
-      </td>
78
-      <td>
79
-        July 15, 2008
80
-      </td>
81
-    </tr>
82
-    
83
-    <tr>
84
-      <td>
85
-        <b>Deliverable B:</b>Implementation of protocol change<br />
86
-        <small><em>After design, evaluation and peer review the modifications
87
-        need to be implemented and integrated with the current Tor code base. The actual implementation of
88
-        the necessary changes will take approximately three months.
89
-        </em></small>
90
-      </td>
91
-      <td>
92
-        October 15, 2008
93
-      </td>
94
-    </tr>
95
-    
96
-    <tr bgcolor="#e5e5e5">
97
-      <td>
98
-        <b>Deliverable C:</b>Testing<br />
99
-        <small><em>Since the modification is highly critical to the security
100
-        and anonymity of the Tor network, it requires extensive testing and debugging in laboratory and real life
101
-        conditions. A period of three months is projected for testing and debugging, where the
102
-        responsible developer is committed to the testing effort with 1/3 of its time. Part of the
103
-        testing phase will be a public beta period.
104
-        </em></small>
105
-      </td>
106
-      <td>
107
-        January 15, 2009
108
-      </td>
109
-    </tr>
110
-    
111
-    <tr>
112
-      <td>
113
-        <b>Deliverable D:</b>Rollout<br />
114
-        <small><em>The actual rollout to the Tor server network will be
115
-          conducted in sync with the regular Tor
116
-          release schedule. As this schedule is dependent on a number of external
117
-          factors, like the completion of other software projects that should go into the same
118
-          release, the actual release time and the time until this release has been accepted and
119
-          installed by most Tor server operators can vary. From experience a period of three to four
120
-          months can be expected. The rollout will be conducted as part of the regular Tor
121
-          release process that is a persistent activity done by volunteers and by personal paid through
122
-          other grants to the Tor project.
123
-        </em></small>
124
-      </td>
125
-      <td>
126
-        April 15, 2009
127
-      </td>
128
-    </tr>
129
-    </table>
130
-    
131
-    <br />
132
-    
133
-    <a id="Reports"></a>
134
-    <h2><a class="anchor" href="#Reports">Monthly Status Reports</a></h2>
135
-    <p>
136
-    There will be in total eight monthly status reports beginning with the
137
-    first deliverable on July 15, 2008 and ending with completion of
138
-    implementation and testing work on January 15, 2009.
139
-    </p>
140
-    
141
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
142
-    <thead>
143
-    <tr>
144
-    <th><big>Month,</big></th>
145
-    <th><big>Status Report</big></th>
146
-    </tr>
147
-    </thead>
148
-    
149
-    <tr bgcolor="#e5e5e5">
150
-      <td>
151
-        <a id="Jun08"></a>
152
-        <a class="anchor" href="#Jun08">Jun 08</a>
153
-      </td>
154
-      <td>
155
-        <small><em>We did some initial measuring of Tor clients
156
-        bootstrapping. The results are not very surprising: a client
157
-        fetches about 10KB of certs, one consensus for 140KB (now 90KB, see
158
-        next paragraph), and about 1.5 megs of Server Descriptors (after
159
-        half of which it starts building circuits).</em></small>
160
-        <br />
161
-        <small><em><a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/138-remove-down-routers-from-consensus.txt">Proposal
162
-        138</a> shrinks consensus documents by 30% to
163
-        40% and has already been implemented and merged into the spec.
164
-        Implementation is part of the 0.2.1.x-alpha tree and the code will
165
-        take effect once over two-thirds of the directory authorities
166
-        (i.e. 5 out of 6) have upgraded.</em></small>
167
-        <br />
168
-        <small><em><a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt">Proposal
169
-        140</a> does not directly relate to reducing initial download size,
170
-        but instead tries to make subsequent downloads of new consensus
171
-        documents use fewer bytes has also been written up and <a
172
-        href="http://archives.seul.org/or/dev/Jun-2008/msg00013.html">sent to
173
-        or-dev</a>. There are some questions to be answered from other Tor
174
-        developers first, but other than that I think it's fine and could
175
-        be implemented.</em></small>
176
-        <br />
177
-        <small><em>The Big Thing is making clients not download all 1.5 megs
178
-        of server descriptors. <a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt">Proposal
179
-        141</a> has been <a
180
-        href="http://archives.seul.org/or/dev/Jun-2008/msg00017.html">sent
181
-        to or-dev</a>. There are basically 3 things to it, as
182
-        far as I can see at the moment: move load balancing info into the
183
-        consensus (should not be hard), implement something so that Tor
184
-        clients can fetch SDs on demand from routers along their circuit
185
-        while they are building it (described in the draft), and deal with
186
-        exit selection. We're still developing ideas for the last part;
187
-        some possibilities are mentioned in the draft.</em></small>
188
-      </td>
189
-    </tr>
190
-    
191
-    <tr>
192
-      <td>
193
-        <a id="Jul08"></a>
194
-        <a class="anchor" href="#Jul08">Jul 08</a>
195
-      </td>
196
-      <td>
197
-        <small><em>Work on <a
198
-        href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt">Proposal
199
-        141</a> is continuing:  There are two basic ideas for how to move
200
-        load balancing information into the consensus: One is the
201
-        authorities generate the weights that clients should use and put
202
-        that in the consensus, the other approach is to just put bandwidth
203
-        information from the server descriptor there.  The latter option
204
-        is probably friendlier when one also considers <a
205
-        href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt">Proposal
206
-        140</a> since it avoids a having number of highly fluctuating
207
-        numbers in the consensus.</em></small>
208
-        <br />
209
-        <small><em>For handling exit policies <a
210
-        href="http://archives.seul.org/or/dev/Jul-2008/msg00022.html">a
211
-        post on the or-dev mailinglist</a> suggests that a hash identifying a
212
-        node's exit policy be added to the consensus document.  The addition
213
-        of another 160 high-entropy bits per node to the consensus might
214
-        be a cause for concern but we think that since a lot of the exit
215
-        policies are the same the consensus document will compress nicely.
216
-        Measurements pending.</em></small>
217
-      </td>
218
-    </tr>
219
-    
220
-    <tr bgcolor="#e5e5e5">
221
-      <td>
222
-        <a id="Aug08"></a>
223
-        <a class="anchor" href="#Aug08">Aug 08</a>
224
-      </td>
225
-      <td>
226
-        <small><em>Directory authority voting documents, and their consensus
227
-        forming algorithm have been changed to include bandwidth information
228
-        and policy summaries as documented in Proposal 141.  Once five of
229
-        the six running authorities have upgraded to trunk at at least
230
-        revision 16554 the consensus will start to include that
231
-        information.</em></small>
232
-      </td>
233
-    </tr>
234
-    
235
-    <tr>
236
-      <td>
237
-        <a id="Sep08"></a>
238
-        <a class="anchor" href="#Sep08">Sep 08</a>
239
-      </td>
240
-      <td>
241
-    <small><em>No updates for September.</em></small>
242
-      </td>
243
-    </tr>
244
-    
245
-    <tr bgcolor="#e5e5e5">
246
-      <td>
247
-        <a id="Oct08"></a>
248
-        <a class="anchor" href="#Oct08">Oct 08</a>
249
-      </td>
250
-      <td><p>
251
-    <small><em>We didn't hit our "finish
252
-    the implementation" milestone for this month since the developer leading
253
-    the project has too much on his plate. The good news there is that we've
254
-    gotten quite a bit of the implementation work done, and it's been in for
255
-    several months now (since the August milestone) so it's seen a lot of
256
-    testing already. The remaining implementation steps are to teach relays
257
-    how to receive requests for fetching a relay descriptor from inside a
258
-    circuit (we probably want to use a new cell type specifically for this,
259
-    so we cut out a round-trip), and then teach clients to do that when the
260
-    relay they're using is running a recent enough version. These two steps
261
-    are written in more detail in
262
-    <a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt">Section 3.2 of proposal 141</a></em></small></p>
263
-    
264
-    <p><small><em>Our new timing plan is to have both of these pieces in place by mid Nov,
265
-    and if that starts looking less likely then we're going to do a more
266
-    radical overhaul of our timing plan and maybe also the design.</em></small></p>
267
-    
268
-    <p><small><em>There are several other components we'd like to get
269
-    to after this piece of it -- one we've been thinking about a lot lately
270
-    is downloading "diffs" of the latest consensus:
271
-    <a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt">140-consensus-diffs.txt</a>.
272
-    First this could save bandwidth, which is always nice when multiplied
273
-    by the total number of clients, but it also means that we can use this
274
-    saved bandwidth to fetch the diffs more often than the current "every
275
-    3 to 4 hours". If clients learn more up-to-date directory information,
276
-    then they can build faster paths because they have better information for
277
-    each relay's bandwidth (which ties into the first NLnet project above),
278
-    but the key new idea is that it also means that we're better at taking
279
-    advantage of transient relays: right now a relay needs to be up for 3 or
280
-    4 hours before it sees any users, and that rules out a lot of volunteers
281
-    who want to run a relay but only want to be up a few hours at a time.</em></small></p>
282
-    <p><small><em>The next step is to get the
283
-    implementation for proposal 141 finished so we can start putting it in
284
-    front of users for testing. Soon, we hope!</em></small></p>
285
-      </td>
286
-    </tr>
287
-    
288
-    <tr>
289
-      <td>
290
-        <a id="Nov08"></a>
291
-        <a class="anchor" href="#Nov08">Nov 08</a>
292
-      </td>
293
-      <td>
294
-    <p><small><em>It looks like the
295
-    original plan we had for the last development piece was both a) way
296
-    harder than we hoped, and b) hopefully overkill compared to what we need.</em></small></p>
297
-    
298
-    <p><small><em> Roger restarted the design discussion on or-dev:
299
-    <a href="http://archives.seul.org/or/dev/Nov-2008/threads.html">http://archives.seul.org/or/dev/Nov-2008/threads.html</a>.</em></small></p>
300
-    
301
-    <p><small><em>I think we now have a better handle on the options and tradeoffs:
302
-    <a href="http://archives.seul.org/or/dev/Nov-2008/msg00007.html">http://archives.seul.org/or/dev/Nov-2008/msg00007.html</a>.</em></small></p>
303
-    
304
-    <p><small><em>Nick has been buried in other development projects (hopefully starting to
305
-    wrap up this month-ish), and I want to get his opinion on how to proceed;
306
-    I am hoping we'll pick one of the more simple approaches.</em></small></p>
307
-    
308
-    <p><small><em>Alas, the really simple approaches provide less scalability. But I think
309
-    they will be good stopgaps until later -- and when 'later' arrives, who
310
-    knows what else will have changed.</em></small></p>
311
-      </td>
312
-    </tr>
313
-    
314
-    <tr bgcolor="#e5e5e5">
315
-      <td>
316
-        <a id="Jan09"></a>
317
-        <a class="anchor" href="#Jan09">Jan 09</a>
318
-      </td>
319
-      <td>
320
-    <p><small><em>
321
-    I wrote up the more detailed version of our new design idea, as <a
322
-    href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/158-microdescriptors.txt">Tor
323
-    proposal #158</a>, and discussion has started at <a
324
-    href="http://archives.seul.org/or/dev/Jan-2009/msg00010.html">http://archives.seul.org/or/dev/Jan-2009/msg00010.html</a>.</em></small></p>
325
-    
326
-    <p><small><em>
327
-    I think this is finally the one! (Well, once I finish folding in all
328
-    the comments.)
329
-    </em></small></p>
330
-    
331
-    <p><small><em>
332
-    One of the big reasons why the project isn't on its original schedule is
333
-    that a main conclusion from <a href="<page projects/hidserv>">Karsten's
334
-    NLnet project on hidden service performance</a> was that it's the circuit
335
-    extension that's the main killer. Yet this project had proposed to add
336
-    more round-trips and complexity into exactly that step. So we needed
337
-    to build a better plan to achieve the original goal without screwing up
338
-    performance even more.
339
-    </em></small></p>
340
-    
341
-    <p><small><em>We've been revising the design proposal over the past weeks, and
342
-    I think we'll be ready soon to start implementing. Note that since
343
-    we have a bunch of development items we're hoping to land in mid Feb
344
-    already, it's likely that this implementation won't land until late Feb
345
-    or March. This time for sure!</em></small></p>
346
-      </td>
347
-    </tr>
348
-    </table>
349
-    
350
-    <br />
351
-  </div>
352
-  <!-- END MAINCOL -->
353
-  <div id = "sidecol">
354
-#include "side.wmi"
355
-#include "info.wmi"
356
-  </div>
357
-  <!-- END SIDECOL -->
358
-</div>
359
-<!-- END CONTENT -->
360
-#include <foot.wmi>    
... ...
@@ -9,18 +9,23 @@
9 9
     <a href="<page projects/projects>">Projects Overview</a>
10 10
   </div>
11 11
 	<div id="maincol">
12
-  	<h1>Client-side Projects</h1>
13
-    <p>Does client side vs. server side matter?  Is this a sensible
14
-taxonomy?</p>
12
+  	<h1>Software &amp; Services</h1>
13
+    <p>The Tor Project maintains a growing set of software and services
14
+in order to make your experience safer, better, and more anonymous.</p>
15 15
     <div class="featured-project focus left first">
16 16
 			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
17 17
       <div class="name">Torbutton</div>
18
-      <p>Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor.  To keep you safe, Torbutton disables many types of active content. Read more about it in the <a href="<page torbutton/index>">torbutton docs</a>.
18
+      <p>Torbutton is a 1-click way for Firefox users to enable or
19
+disable Tor in Firefox.  To keep you safe, Torbutton disables many types
20
+of active content. <a href="<page torbutton/index>">Learn more
21
+&raquo;</a></p>
19 22
     </div>
20 23
     <div class="featured-project focus left">
21 24
 			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
22 25
       <div class="name">Tor Browser Bundle</div>
23
-      <p>The Tor Browser Bundle lets you use Tor on Windows, Linux, or Mac OS X without needing to install any software. It can run off a USB flash drive, comes with a pre-configured web browser and is self-contained. The Tor IM Browser Bundle additionally allows instant messaging and chat over Tor. </p>
26
+      <p>The Tor Browser Bundle contains everything you need to safely
27
+browse the Internet. This package requires no installation. Just extract
28
+it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
24 29
     </div>
25 30
     <table class="topforty">
26 31
     	<tr>
... ...
@@ -28,12 +33,13 @@ taxonomy?</p>
28 33
           <div class="name">TorBEL</div>
29 34
           <p>The Tor Bulk Exitlist is a service others can query to
30 35
 determine if an IP is a tor exit node or not, and if so, on which tcp
31
-ports it allows traffic.  Read more about the <a href="<wiki>/ projects/TorBulkExitlist>">Tor Bulk Exit List</a></p> 
36
+ports it allows traffic.  Read more about the <a href="<wiki>projects/TorBulkExitlist>">Tor Bulk Exit List</a></p> 
32 37
         </td>
33 38
         <td>
34 39
           <div class="name">Vidalia</div>
35
-          <div class="caps">By Author</div>
36
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/vidalia>">Learn more &raquo;</a></p>
40
+          <p>Vidalia is a graphical Tor controller.  It allows you to
41
+see where your connections are in the world and configure Tor without
42
+getting into configuration files and code.  <a href="<page projects/vidalia>">Learn more &raquo;</a></p>
37 43
         </td>
38 44
         <td class="beige">
39 45
           <div class="name">Project Name</div>
40 46
deleted file mode 100644
... ...
@@ -1,107 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision: 0 $
3
-# Translation-Priority: 3-low
4
-
5
-#include "head.wmi" TITLE="Tor Project: Server-side Projects" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
6
-<div id="content" class="clearfix">
7
-  <div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/serverside>">Server-side Projects</a>
11
-  </div>
12
-	<div id="maincol">
13
-  	<h1>Server-side Projects</h1>
14
-    <p>Consectetur adipiscing elit. Proin sit amet dolor justo, lacinia dapibus est. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In orci est, pellentesque sit amet consequat eget, venenatis id augue. Quisque arcu velit, ultricies non porta a, dictum in lorem. Quisque pulvinar laoreet fermentum. Quisque mauris nulla, lobortis non facilisis at, lacinia in diam. Sed at enim tortor, vitae consequat elit.</p>
15
-    <div class="featured-project focus left first">
16
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
17
-      <div class="name">Torbrowser</div>
18
-      <div class="caps">By Author</div>
19
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
20
-    </div>
21
-    <div class="featured-project focus left">
22
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
23
-      <div class="name">Torbutton</div>
24
-      <div class="caps">By Author</div>
25
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page torbutton/index>">Learn more &raquo;</a></p>
26
-    </div>
27
-    <table class="topforty">
28
-    	<tr>
29
-        <td class="beige">
30
-          <div class="name">Tordnsel</div>
31
-          <div class="caps">By Author</div>
32
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/tordnsel>">Learn more &raquo;</a></p>
33
-        </td>
34
-        <td>
35
-          <div class="name">Vidalia</div>
36
-          <div class="caps">By Author</div>
37
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/vidalia>">Learn more &raquo;</a></p>
38
-        </td>
39
-        <td class="beige">
40
-          <div class="name">Project Name</div>
41
-          <div class="caps">By Author</div>
42
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
43
-        </td>
44
-      </tr>
45
-      <tr>
46
-        <td>
47
-          <div class="name">Project Name</div>
48
-          <div class="caps">By Author</div>
49
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
50
-        </td>
51
-        <td class="beige">
52
-          <div class="name">Project Name</div>
53
-          <div class="caps">By Author</div>
54
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
55
-        </td>
56
-        <td>
57
-          <div class="name">Project Name</div>
58
-          <div class="caps">By Author</div>
59
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
60
-        </td>
61
-      </tr>
62
-      <tr>
63
-        <td class="beige">
64
-          <div class="name">Project Name</div>
65
-          <div class="caps">By Author</div>
66
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
67
-        </td>
68
-        <td>
69
-          <div class="name">Project Name</div>
70
-          <div class="caps">By Author</div>
71
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
72
-        </td>
73
-        <td class="beige">
74
-          <div class="name">Project Name</div>
75
-          <div class="caps">By Author</div>
76
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
77
-        </td>
78
-      </tr>
79
-      <tr>
80
-        <td>
81
-          <div class="name">Project Name</div>
82
-          <div class="caps">By Author</div>
83
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
84
-        </td>
85
-        <td class="beige">
86
-          <div class="name">Project Name</div>
87
-          <div class="caps">By Author</div>
88
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
89
-        </td>
90
-        <td>
91
-          <div class="name">Project Name</div>
92
-          <div class="caps">By Author</div>
93
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
94
-        </td>
95
-      </tr>
96
-    </table>
97
-    <!-- END TABLE -->
98
-  </div>
99
-  <!-- END MAINCOL -->
100
-  <div id = "sidecol">
101
-#include "side.wmi"
102
-#include "info.wmi"
103
-  </div>
104
-  <!-- END SIDECOL -->
105
-</div>
106
-<!-- END CONTENT -->
107
-#include <foot.wmi>     
... ...
@@ -23,8 +23,8 @@
23 23
 <:
24 24
   my $sidenav;
25 25
   $sidenav = [
26
-      {'url'  => 'projects/clientside',
27
-       'txt'  => 'Client-side Projects',
26
+      {'url'  => 'projects/projects',
27
+       'txt'  => 'Software &amp; Services',
28 28
        'subelements' => [
29 29
           {'url'  => 'torbutton/index',
30 30
            'txt'  => 'TorButton',
... ...
@@ -36,7 +36,7 @@
36 36
                'txt' => 'TorButton FAQ',
37 37
               },
38 38
           ]},
39
-          {'url'  => 'http://check.torproject.org',
39
+          {'url'  => 'https://check.torproject.org',
40 40
            'txt'  => 'TorCheck',
41 41
           }, 
42 42
           {'url'  => 'projects/sampleproject',
... ...
@@ -75,13 +75,7 @@
75 75
 #          {'url'  => 'projects/sampleproject',
76 76
 #           'txt'  => 'TBB Builds',
77 77
 #          }],
78
-      },
79
-      {'url'  => 'projects/serverside',
80
-       'txt'  => 'Server-side Projects',
81
-       'subelements' => [
82
-          {'url'  => 'https://metrics.torproject.org',
83
-           'txt'  => 'https://metrics.torproject.org', 
84
-          }],
78
+      }],
85 79
        #   {'url'  => '',
86 80
        #    'txt'  => '',
87 81
        #   }],