commit 29526d99f7fea3e35af289c8d66613be653c79c6 Author: Karsten Loesing karsten.loesing@gmx.net Date: Sat Mar 18 22:39:39 2017 +0100

Reorganize sources page into main and other sources. --- website/src/main/resources/web/WEB-INF/sources.jsp | 42 +++++----------------- 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/website/src/main/resources/web/WEB-INF/sources.jsp b/website/src/main/resources/web/WEB-INF/sources.jsp index b36d43f..301a2ea 100644 --- a/website/src/main/resources/web/WEB-INF/sources.jsp +++ b/website/src/main/resources/web/WEB-INF/sources.jsp @@ -17,51 +17,27 @@ <p>You're a data person and only trust the statistics that you doctored yourself? Here's all the data right from the source, doctor.</p> </div>

- <div class="container tools"> - <h2>Network archives <a href="#archive" name="archive" class="anchor">#</a></h2> - <p>We get our data from the network archives below.</p> - <div class="row"> - <div class="col-md-3 col-sm-4 col-xs-6"> - <a href="https://collector.torproject.org/" target="_blank"> - <div class="logo" style="background-image:url(images/collector-logo.png);"></div> - <h2>CollecTor</h2> - <p>collects and archives data from various nodes and services in the public Tor network.</p> - </a> - </div> - <div class="col-md-3 col-sm-4 col-xs-6"> - <a href="https://ooni.torproject.org/" target="_blank"> - <div class="logo" style="background-image:url(images/ooni-logo.png);"></div> - <h2>OONI</h2> - <p>detects censorship, surveillance, and traffic manipulation on the internet.</p> - </a> - </div> - </div> - </div> - <div class="container"> + <h2>Main sources <a href="#main" name="main" class="anchor">#</a></h2> + <p>We get most of our data from the services below.</p> <ul> - <li><a href="https://webstats.torproject.org/" target="_blank"><code>webstats.torproject.org</code></a> collects logs from <code>torproject.org</code> web servers and provides them as a stripped-down version of Apache's "combined" log format without IP addresses, log times, HTTP parameters, referers, and user agent strings.</li> + <li><a href="collector.html">CollecTor</a> collects and archives data from various nodes and services in the public Tor network.</li> + <li><a href="stats.html">Statistics</a> used for visualizations on this site are available in the CSV format.</li> + <li><a href="onionoo.html">Onionoo</a> provides current and historical data about relays and bridges via a web-based API.</li> </ul> </div>

<div class="container"> - <h2>Measurement tools <a href="#measurement" name="measurement" class="anchor">#</a></h2> - <p>The following tools perform active measurements in the Tor network.</p> + <h2>Other sources <a href="#other" name="other" class="anchor">#</a></h2> + <p>The following tools perform active measurements in the Tor network or provide other Tor network data.</p> <ul> <li><a href="https://gitweb.torproject.org/user/phw/exitmap.git" target="_blank">Exitmap</a> is a fast and extensible scanner for Tor exit relays.</li> <li><a href="https://www.torproject.org/projects/tordnsel.html.en" target="_blank">TorDNSEL</a> publishes lists of IP addresses of multi-homed Tor exits.</li> <li><a href="https://gitweb.torproject.org/torperf.git" target="_blank">Torperf</a> measures Tor performance with a set of utilities and Python scripts.</li> <li><a href="https://github.com/robgjansen/onionperf" target="_blank">OnionPerf</a> measures the performance of onion services.</li> + <li><a href="https://ooni.torproject.org/" target="_blank">OONI</a> detects censorship, surveillance, and traffic manipulation on the internet.</li> <li><a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/" target="_blank">Sybilhunter</a> attempts to detect Sybil attacks onthe Tor network.</li> - </ul> - </div> - - <div class="container"> - <h2>Pre-aggregated data <a href="#aggregated" name="aggregated" class="anchor">#</a></h2> - <p>Sometimes the data from the original sources can be hard to process. If you want to take a little shortcut, try out the following pre-aggregated statistics.</p> - <ul> - <li><a href="stats.html">CSV files</a> are available with aggregated statistics of visualizations on this site.</li> - <li><a href="https://onionoo.torproject.org/" target="_blank">Onionoo</a> provides current and historical data about relays and bridges via a web-based API.</li> + <li><a href="https://webstats.torproject.org/" target="_blank">Webstats</a> collects logs from <code>torproject.org</code> web servers and provides them as a stripped-down version of Apache's "combined" log format without IP addresses, log times, HTTP parameters, referers, and user agent strings.</li> </ul> </div>