Browse code

Merge branch 'irl-patch'

hiromipaw authored on07/02/2018 11:40:56
Showing5 changed files
... ...
@@ -112,7 +112,7 @@ href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/">
112 112
 <dt>Sathyanarayanan Gunasekaran, Developer</dt>
113 113
 <dd>Worked on Orbot in Google
114 114
 Summer of Code 2011, and developed <a
115
-href="https://compass.torproject.org/">Compass</a>.</dd>
115
+href="https://gitweb.torproject.org/compass.git/">Compass</a>.</dd>
116 116
 
117 117
 <dt>Marie Gutbub, Advocate</dt>
118 118
 <dd>Helps educate the world about the value of Tor, especially
... ...
@@ -198,9 +198,8 @@ Perry.</dd>
198 198
 projects such as Vidalia, Torbutton and the website.</dd>
199 199
 
200 200
 <dt>Christian Schulz, Developer</dt>
201
-<dd>Developed <a
202
-href="https://globe.torproject.org/">Globe</a>, which is on
203
-its way to replacing Atlas and eventually Compass.</dd>
201
+<dd>Developed <a href="http://globe.rndm.de/">Globe</em>, a web application to
202
+show information about relays that make up the Tor network.</dd>
204 203
 
205 204
 <dt>Andrea Shepard, Developer</dt>
206 205
 <dd>Works with Nick as a core Tor developer.</dd>
... ...
@@ -115,7 +115,7 @@
115 115
       <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=67EF3966509986E96ACEE84E5D67CD18702287F4"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
116 116
       <div class="name"><a href="#hellais">Arturo Filastò</a></div>
117 117
       <div class="field"><b>IRC:</b> hellais</div>
118
-      <div class="description">Project leader for <a href="https://ooni.torproject.org/">OONI</a>, has helped with <a href="http://tor2web.org/">tor2web</a>, wrote <a href="https://atlas.torproject.org/">Atlas</a>, and helps improve security.</div>
118
+      <div class="description">Project leader for <a href="https://ooni.torproject.org/">OONI</a>, has helped with <a href="http://tor2web.org/">tor2web</a>, wrote Atlas which later became <a href="https://atlas.torproject.org/">Relay Search</a>, and helps improve security.</div>
119 119
     </td>
120 120
   </tr>
121 121
 
... ...
@@ -271,7 +271,7 @@
271 271
       <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=A8F7BA5041E133339CBA169676D58093F540ABCD"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
272 272
       <div class="name"><a href="#irl">Iain Learmonth</a></div>
273 273
       <div class="field"><b>IRC:</b> irl</div>
274
-      <div class="description"><a href="https://metrics.torproject.org">Metrics team member</a> and maintainer of <a href="https://atlas.torproject.org/">Atlas</a>.</div>
274
+      <div class="description"><a href="https://metrics.torproject.org">Metrics team member</a> and maintainer of <a href="https://atlas.torproject.org/">Relay Search</a>.</div>
275 275
     </td>
276 276
 
277 277
     <td>
... ...
@@ -223,8 +223,8 @@
223 223
     Tor</a>.</li>
224 224
     <li><a href="https://check.torproject.org/">The
225 225
     Tor detector</a> tries to guess if you're using Tor or not.</li>
226
-    <li>Check out one of the Tor status pages, such as the <a
227
-    href="https://atlas.torproject.org/">Atlas</a> and <a href="https://compass.torproject.org/">Compass</a> pages.
226
+    <li>Check out Tor network status information using <a
227
+    href="https://atlas.torproject.org/">Relay Search</a>.
228 228
     Remember that these lists may not be as accurate as what your Tor
229 229
     client uses, because your client fetches its own directory information and
230 230
     examines it locally.</li>
... ...
@@ -109,7 +109,7 @@
109 109
               <div class="project">
110 110
                 <a href="https://atlas.torproject.org/"><img
111 111
                 src="$(IMGROOT)/icon-TorStatus.jpg" alt="Atlas Icon"></a>
112
-                <h3><a href="https://atlas.torproject.org/">Atlas</a></h3>
112
+                <h3><a href="https://atlas.torproject.org/">Relay Search</a></h3>
113 113
                 <p>Site providing an overview of the Tor network.</p>
114 114
                 </div>
115 115
               </td>
... ...
@@ -247,21 +247,13 @@ meetings around the world.</li>
247 247
       </tr>
248 248
 
249 249
       <tr>
250
-        <td><a href="#project-atlas">Atlas</a></td>
250
+        <td><a href="#project-atlas">Relay Search</a></td>
251 251
         <td>Client Service</td>
252 252
         <td>JavaScript</td>
253 253
         <td>Light</td>
254 254
         <td>irl</td>
255 255
       </tr>
256 256
 
257
-      <tr>
258
-        <td><a href="#project-compass">Compass</a></td>
259
-        <td>Client Service</td>
260
-        <td>Python</td>
261
-        <td>None</td>
262
-        <td></td>
263
-      </tr>
264
-
265 257
       <tr>
266 258
         <td><a href="#project-onionoo">Onionoo</a></td>
267 259
         <td>Backend Service</td>
... ...
@@ -570,13 +562,13 @@ meetings around the world.</li>
570 562
     </p>
571 563
 
572 564
     <a id="project-atlas"></a>
573
-    <h3><a href="https://atlas.torproject.org/">Atlas</a> (<a
565
+    <h3><a href="https://atlas.torproject.org/">Relay Search</a> (<a
574 566
     href="https://gitweb.torproject.org/atlas.git">code</a>)</h3>
575 567
 
576 568
     <p>
577
-    Atlas is a web application to discover Tor relays and bridges. It provides
578
-    useful information on how relays are configured along with graphics about
579
-    their past usage.
569
+    Relay Search is a web application to discover Tor relays and bridges. It
570
+    provides useful information on how relays are configured along with graphics
571
+    about their past usage.
580 572
     </p>
581 573
 
582 574
     <p>
... ...
@@ -589,17 +581,6 @@ meetings around the world.</li>
589 581
     been discontinued.
590 582
     </p>
591 583
 
592
-    <a id="project-compass"></a>
593
-    <h3><a href="https://compass.torproject.org/">Compass</a> (<a
594
-    href="https://gitweb.torproject.org/compass.git">code</a>, <a
595
-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Metrics%2FCompass&order=priority">bug
596
-    tracker</a>)</h3>
597
-
598
-    <p>
599
-    Compass is a web and command line application that filters and
600
-    aggregates the Tor relays based on various attributes.
601
-    </p>
602
-
603 584
     <a id="project-onionoo"></a>
604 585
     <h3><a href="https://onionoo.torproject.org/">Onionoo</a> (<a
605 586
     href="https://gitweb.torproject.org/onionoo.git">code</a>,