July 2017 - tor-commits - lists.torproject.org

[metrics-web/master] Reorganize sources page into main and other sources.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit 29526d99f7fea3e35af289c8d66613be653c79c6 Author: Karsten Loesing <karsten.loesing(a)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>

1 0

[metrics-web/master] Fix links on Onionoo page.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit d159f647bfb440cfa903ea8c6092816c2844aff0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Mar 19 16:34:10 2017 +0100 Fix links on Onionoo page. --- website/src/main/resources/web/WEB-INF/onionoo.jsp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index df1fef0..dbf080d 100644 --- a/website/src/main/resources/web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -701,7 +701,7 @@ Omitted if zero. <a id="summary"></a><br> <h2>Summary documents <a href="#summary" class="anchor">#</a> <span class="request-response"> -<a href="summary?limit=4">example request</a> +<a href="https://onionoo.torproject.org/summary?limit=4">example request</a> </span> </h2> @@ -806,7 +806,7 @@ running in the last bridge network status. <a id="details"></a><br> <h2>Details documents <a href="#details" class="anchor">#</a> <span class="request-response"> -<a href="details?limit=4">example request</a> +<a href="https://onionoo.torproject.org/details?limit=4">example request</a> </span> </h2> @@ -1568,7 +1568,7 @@ graphs. <a id="bandwidth"></a><br> <h2>Bandwidth documents <a href="#bandwidth" class="anchor">#</a> <span class="request-response"> -<a href="bandwidth?limit=4">example request</a> +<a href="https://onionoo.torproject.org/bandwidth?limit=4">example request</a> </span> </h2> @@ -1687,7 +1687,7 @@ The specification of graph history objects is similar to those in the <a id="weights"></a><br> <h2>Weights documents <a href="#weights" class="anchor">#</a> <span class="request-response"> -<a href="weights?limit=4">example request</a> +<a href="https://onionoo.torproject.org/weights?limit=4">example request</a> </span> </h2> @@ -1807,7 +1807,7 @@ The specification of this history object is similar to that in the <a id="clients"></a><br> <h2>Clients documents <a href="#clients" class="anchor">#</a> <span class="request-response"> -<a href="clients?limit=4">example request</a> +<a href="https://onionoo.torproject.org/clients?limit=4">example request</a> </span> </h2> @@ -1928,7 +1928,7 @@ It might be removed in the future without notice.</span> <a id="uptime"></a><br> <h2>Uptime documents <a href="#uptime" class="anchor">#</a> <span class="request-response"> -<a href="uptime?limit=4">example request</a> +<a href="https://onionoo.torproject.org/uptime?limit=4">example request</a> </span> </h2> @@ -2044,7 +2044,7 @@ information. <p> <code>/summary?limit=4</code> -(<a href="/summary?limit=4">view result</a>) +(<a href="https://onionoo.torproject.org/summary?limit=4">view result</a>) </p> <p> @@ -2056,7 +2056,7 @@ new queries to avoid downloading huge responses. <p> <code>/summary?limit=4&search=moria</code> -(<a href="/summary?limit=4&search=moria">view result</a>) +(<a href="https://onionoo.torproject.org/summary?limit=4&search=moria">view result</a>) </p> <p> @@ -2066,7 +2066,7 @@ string "moria" in one of a few searched fields. <p> <code>/details?limit=4&search=moria</code> -(<a href="/details?limit=4&search=moria">view result</a>) +(<a href="https://onionoo.torproject.org/details?limit=4&search=moria">view result</a>) </p> <p> @@ -2076,7 +2076,7 @@ details documents containing, well, more details. <p> <code>/details?limit=4&search=moria&fields=nickname</code> -(<a href="/details?limit=4&search=moria&fields=nickname">view result</a>) +(<a href="https://onionoo.torproject.org/details?limit=4&search=moria&fields=nickname">view result</a>) </p> <p> @@ -2087,7 +2087,7 @@ This parameter is only implemented for details documents. <p> <code>/details?limit=4&search=moria&fields=nickname&order=-consensus_weight</code> -(<a href="/details?limit=4&search=moria&fields=nickname&order=-consensus_weight">view result</a>) +(<a href="https://onionoo.torproject.org/details?limit=4&search=moria&fields=nickname…">view result</a>) </p> <p>

1 0

[metrics-web/master] Change CollecTor links to the new page.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit baaf9c81487646a3dc7f4aee7679ea7af0165ba7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Mar 19 16:37:46 2017 +0100 Change CollecTor links to the new page. --- website/src/main/resources/web/WEB-INF/development.jsp | 2 +- website/src/main/resources/web/WEB-INF/metrics-lib.jsp | 6 +++--- website/src/main/resources/web/WEB-INF/stats.jsp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/development.jsp b/website/src/main/resources/web/WEB-INF/development.jsp index 2627530..9b35364 100644 --- a/website/src/main/resources/web/WEB-INF/development.jsp +++ b/website/src/main/resources/web/WEB-INF/development.jsp @@ -19,7 +19,7 @@ <div class="container"> <h2>Parsing libraries <a href="#libraries" name="libraries" class="anchor">#</a></h2> - <p>The following libraries help you with parsing Tor network data from the <a href="https://collector.torproject.org/" target="_blank">CollecTor</a> service.</p> + <p>The following libraries help you with parsing Tor network data from the <a href="collector.html">CollecTor</a> service.</p> <ul> <li><a href="metrics-lib.html">Tor Metrics Library</a> is a Java library to fetch and parse Tor descriptors.</li> <li><a href="https://stem.torproject.org/" target="_blank">Stem</a> is a Python library that parses Tor descriptors.</li> diff --git a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp b/website/src/main/resources/web/WEB-INF/metrics-lib.jsp index 44b2a79..4188a42 100644 --- a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp +++ b/website/src/main/resources/web/WEB-INF/metrics-lib.jsp @@ -18,7 +18,7 @@ <div class="jumbotron"> <div class="text-center"> <h2>Tor Metrics Library</h2> -<p>Tor Metrics Library is a Java API that facilitates processing Tor network data from the <a href="https://collector.torproject.org/">CollecTor</a> service for statistical analysis and for building services and applications.</p> +<p>Tor Metrics Library is a Java API that facilitates processing Tor network data from the <a href="collector.html">CollecTor</a> service for statistical analysis and for building services and applications.</p> <a class="btn btn-primary btn-lg" style="margin: 10px" href="https://dist.torproject.org/metrics-lib/?C=M;O=D"><i class="fa fa-chevron-right" aria-hidden="true"></i> Download Release</a> <a class="btn btn-primary btn-lg" style="margin: 10px" href="https://gitweb.torproject.org/metrics-lib.git/plain/CHANGELOG.md"><i class="fa fa-chevron-right" aria-hidden="true"></i> View Change Log</a> <a class="btn btn-primary btn-lg" style="margin: 10px" href="metrics-lib/"><i class="fa fa-chevron-right" aria-hidden="true"></i> Browse JavaDocs</a> @@ -36,13 +36,13 @@ <h1>metrics-lib</h1> -<p>Welcome to metrics-lib, a Java API that facilitates processing Tor network data from the <a href="https://collector.torproject.org/">CollecTor</a> service for statistical analysis and for building services and applications.</p> +<p>Welcome to metrics-lib, a Java API that facilitates processing Tor network data from the <a href="collector.html">CollecTor</a> service for statistical analysis and for building services and applications.</p> <p>In the tutorials below we're explaining the basic steps to get you started with metrics-lib.</p> <h2 id="prerequisites">Prerequisites and preparation <a href="#prerequisites" class="anchor">#</a></h2> -<p>The following tutorials are written with an audience in mind that knows Java and to a lesser extent how Tor works. We explain all data used in the tutorials. More and most up-to-date information about descriptors can be found in the <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor directory protocol specification</a> and on the <a href="https://collector.torproject.org/">CollecTor website</a>.</p> +<p>The following tutorials are written with an audience in mind that knows Java and to a lesser extent how Tor works. We explain all data used in the tutorials. More and most up-to-date information about descriptors can be found in the <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor directory protocol specification</a> and on the <a href="collector.html">CollecTor page</a>.</p> <p>All tutorials require you to <a href="https://dist.torproject.org/descriptor/?C=M;O=D">download</a> the latest release of metrics-lib, follow the instructions to <a href="https://gitweb.torproject.org/metrics-lib.git/tree/README.md">verify</a> its signature, extract the tarball locally, and copy the <code>lib/</code> and the <code>generated/</code> directories to your working directory for the tutorials.</p> diff --git a/website/src/main/resources/web/WEB-INF/stats.jsp b/website/src/main/resources/web/WEB-INF/stats.jsp index 2d5a69d..fd3fd6d 100644 --- a/website/src/main/resources/web/WEB-INF/stats.jsp +++ b/website/src/main/resources/web/WEB-INF/stats.jsp @@ -320,7 +320,7 @@ tool, which periodically fetches static files over Tor and records several timestamps in the process. The data file contains daily medians and quartiles as well as total numbers of requests, timeouts, and failures. Raw Torperf measurement data are available on the <a -href="https://collector.torproject.org/#torperf">CollecTor</a> website.</p> +href="collector.html#torperf">CollecTor</a> website.</p> <p><b>Download as <a href="stats/torperf.csv">CSV file</a>.</b></p>

1 0

[metrics-web/master] Update Onionoo's jumbotron a bit.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit f97b1af18e1ddc2e1d8fd00e7a7c750d4fc5661a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Mar 19 17:44:50 2017 +0100 Update Onionoo's jumbotron a bit. --- website/src/main/resources/web/WEB-INF/onionoo.jsp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index dbf080d..2ccdf9d 100644 --- a/website/src/main/resources/web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -23,14 +23,15 @@ <div class="jumbotron"> <div class="text-center"> <h2> - The Tor network status protocol + Onionoo </h2> <p>Onionoo is a web-based protocol to learn about currently running Tor relays and bridges. Onionoo itself was not designed as a service for human beings—at least not directly. Onionoo provides the data for other applications and websites which in turn present Tor network status information to humans. </p> - <a class="btn btn-primary btn-lg" style="margin: 10px" href="#protocol"><i class="fa fa-chevron-right" aria-hidden="true"></i> Tell me more!</a> + <a class="btn btn-primary btn-lg" style="margin: 10px" href="#versions"><i class="fa fa-chevron-right" aria-hidden="true"></i> View Protocol Versions</a> + <a class="btn btn-primary btn-lg" style="margin: 10px" href="#examples"><i class="fa fa-chevron-right" aria-hidden="true"></i> View Examples</a> </div>

1 0

[metrics-web/master] Remove Onionoo's table of contents.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit 8ba31084169c84957f8bc76354e1c6fc8ed7e945 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Mar 19 17:45:51 2017 +0100 Remove Onionoo's table of contents. --- website/src/main/resources/web/WEB-INF/onionoo.jsp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index 2ccdf9d..32d7cea 100644 --- a/website/src/main/resources/web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -52,26 +52,6 @@ <br> <a id="protocol"></a> -  - <div class="col-md-4 pull-right hidden-xs" style="padding:1.2em 0 0 2em;"> - <div class="list-group"> - <h3>Table of contents</h3> - <a class="list-group-item" href="#general">General</a> - <a class="list-group-item" href="#versions">Protocol versions</a> - <a class="list-group-item" href="#methods">Methods</a> - <a class="list-group-item" href="#responses">Responses</a> - <a class="list-group-item" href="#summary">Summary documents</a> - <a class="list-group-item" href="#details">Details documents</a> - <a class="list-group-item" href="#history">History objects</a> - <a class="list-group-item" href="#bandwidth">Bandwidth documents</a> - <a class="list-group-item" href="#weights">Weights documents</a> - <a class="list-group-item" href="#clients">Clients documents</a> - <a class="list-group-item" href="#uptime">Uptime documents</a> - <a class="list-group-item" href="#examples">Example usage</a> - </div> - </div> - - <h1>The Tor network status protocol <a href="#protocol" class="anchor">#</a></h1> <a id="general"></a><br>

1 0

[metrics-web/master] Fix broken CollecTor links.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit 9f30654cba42b9f7dba2e290bebf3c17c57df8c4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 20 16:55:26 2017 +0100 Fix broken CollecTor links. --- website/src/main/resources/web/WEB-INF/collector.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/main/resources/web/WEB-INF/collector.jsp b/website/src/main/resources/web/WEB-INF/collector.jsp index a66308e..60e8721 100644 --- a/website/src/main/resources/web/WEB-INF/collector.jsp +++ b/website/src/main/resources/web/WEB-INF/collector.jsp @@ -801,7 +801,7 @@ wget --recursive \ # turn on recursive retrieving <h2 id="index-json" class="hover">Custom downloaders using provided <code>index.json</code> <a href="#index-json" class="anchor">#</a></h2> -<p>Another automated way to download descriptors is to develop a tool that uses the provided <a href="index/index.json"><code>index.json</code></a> file or one of its compressed versions <a href="index/index.json.gz"><code>index.json.gz</code></a>, <a href="index/index.json.bz2"><code>index.json.bz2</code></a>, or <a href="index/index.json.xz"><code>index.json.xz</code></a>. +<p>Another automated way to download descriptors is to develop a tool that uses the provided <a href="https://collector.torproject.org/index/index.json"><code>index.json</code></a> file or one of its compressed versions <a href="https://collector.torproject.org/index/index.json.gz"><code>index.json.gz</code></a>, <a href="https://collector.torproject.org/index/index.json.bz2"><code>index.json.bz2</code></a>, or <a href="https://collector.torproject.org/index/index.json.xz"><code>index.json.xz</code></a>. These files contain a machine-readable representation of all descriptor files available on this site. Index files use the following custom JSON data format that might still be extended at a later time:</p> <ul>

1 0

[metrics-web/master] Change Onionoo links to the new page.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit cdb5e5c7bd488063935ee221cd3d3be63995268a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Mar 19 16:38:59 2017 +0100 Change Onionoo links to the new page. --- website/src/main/resources/web/WEB-INF/development.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/development.jsp b/website/src/main/resources/web/WEB-INF/development.jsp index 9b35364..05199a9 100644 --- a/website/src/main/resources/web/WEB-INF/development.jsp +++ b/website/src/main/resources/web/WEB-INF/development.jsp @@ -29,11 +29,11 @@ <div class="container"> <h2>Query support <a href="#query" name="query" class="anchor">#</a></h2> - <p>The following tools help you with querying Tor network data from the <a href="https://onionoo.torproject.org/" target="_blank">Onionoo</a> service.</p> + <p>The following tools help you with querying Tor network data from the <a href="onionoo.html">Onionoo</a> service.</p> <ul> <li><a href="https://savannah.nongnu.org/projects/koninoo/" target="_blank">koninoo</a> is a simple Java command line interface for querying Onionoo data.</li> <li><a href="https://github.com/duk3luk3/onion-py" target="_blank">OnionPy</a> provides memcached support to cache queried data.</li> - <li><a href="https://github.com/lukechilds/onionoo-node-client" target="_blank">onionoo-node-client</a> is a Node.js client library for the <a href="https://onionoo.torproject.org/" target="_blank">Onionoo</a> API.</li> + <li><a href="https://github.com/lukechilds/onionoo-node-client" target="_blank">onionoo-node-client</a> is a Node.js client library for the <a href="onionoo.html">Onionoo</a> API.</li> </ul> </div>

1 0

[metrics-web/master] Make external links more obvious.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit f18ced853c608d8b21f1cb2876d401029bed1bb5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 20 17:06:33 2017 +0100 Make external links more obvious. --- website/src/main/resources/web/WEB-INF/bottom.jsp | 2 +- .../src/main/resources/web/WEB-INF/collector.jsp | 118 ++++++++++----------- .../src/main/resources/web/WEB-INF/glossary.jsp | 4 +- website/src/main/resources/web/WEB-INF/index.jsp | 2 +- .../src/main/resources/web/WEB-INF/metrics-lib.jsp | 14 +-- website/src/main/resources/web/WEB-INF/onionoo.jsp | 22 ++-- website/src/main/resources/web/WEB-INF/stats.jsp | 6 +- website/src/main/resources/web/css/style.css | 4 + 8 files changed, 88 insertions(+), 84 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/bottom.jsp b/website/src/main/resources/web/WEB-INF/bottom.jsp index 1ca6f3c..835b286 100644 --- a/website/src/main/resources/web/WEB-INF/bottom.jsp +++ b/website/src/main/resources/web/WEB-INF/bottom.jsp @@ -3,7 +3,7 @@ <div class="container no-gutter"> <div class="col-xs-6"> <p> - © 2009–2017 <a href="https://www.torproject.org/">The Tor Project</a> + © 2009–2017 <a href="https://www.torproject.org/" target="_blank">The Tor Project</a> </p> </div> <div class="col-xs-6"> diff --git a/website/src/main/resources/web/WEB-INF/collector.jsp b/website/src/main/resources/web/WEB-INF/collector.jsp index 60e8721..a6085f4 100644 --- a/website/src/main/resources/web/WEB-INF/collector.jsp +++ b/website/src/main/resources/web/WEB-INF/collector.jsp @@ -32,8 +32,8 @@ network, or if you're developing an application that uses Tor network data, this is your place to start. </p> -<a class="btn btn-primary btn-lg" style="margin: 10px" href="https://collector.torproject.org/recent/"><i class="fa fa-chevron-right" aria-hidden="true"></i> Browse Recent Descriptors</a> -<a class="btn btn-primary btn-lg" style="margin: 10px" href="https://collector.torproject.org/archive/"><i class="fa fa-chevron-right" aria-hidden="true"></i> Browse Archived Descriptors</a> +<a class="btn btn-primary btn-lg" style="margin: 10px" href="https://collector.torproject.org/recent/" target="_blank"><i class="fa fa-chevron-right" aria-hidden="true"></i> Browse Recent Descriptors</a> +<a class="btn btn-primary btn-lg" style="margin: 10px" href="https://collector.torproject.org/archive/" target="_blank"><i class="fa fa-chevron-right" aria-hidden="true"></i> Browse Archived Descriptors</a> </div> @@ -65,53 +65,53 @@ <tr> <td><a href="#type-server-descriptor">Relay Server Descriptors</a></td> <td><code>@type server-descriptor 1.0</code></td> - <td><a href="https://collector.torproject.org/recent/relay-descriptors/server-descriptor…" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/relay-descriptors/server-descripto…" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/relay-descriptors/server-descriptor…" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/relay-descriptors/server-descripto…" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-extra-info">Relay Extra-info Descriptors</a></td> <td><code>@type extra-info 1.0</code></td> - <td><a href="https://collector.torproject.org/recent/relay-descriptors/extra-infos/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/relay-descriptors/extra-infos/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/relay-descriptors/extra-infos/" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/relay-descriptors/extra-infos/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-network-status-consensus-3">Network Status Consensuses</a></td> <td><code>@type network-status-consensus-3 1.0</code></td> - <td><a href="https://collector.torproject.org/recent/relay-descriptors/consensuses/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/relay-descriptors/consensuses/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/relay-descriptors/consensuses/" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/relay-descriptors/consensuses/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-network-status-vote-3">Network Status Votes</a></td> <td><code>@type network-status-vote-3 1.0</code></td> - <td><a href="https://collector.torproject.org/recent/relay-descriptors/votes/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/relay-descriptors/votes/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/relay-descriptors/votes/" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/relay-descriptors/votes/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-dir-key-certificate-3">Directory Key Certificates</a></td> <td><code>@type dir-key-certificate-3 1.0</code></td> - <td><a href="https://collector.torproject.org/archive/relay-descriptors/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/archive/relay-descriptors/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-network-status-microdesc-consensus-3">Microdescriptor Consensuses</a></td> <td><code>@type network-status-microdesc-consensus-3 1.0</code></td> - <td><a href="https://collector.torproject.org/recent/relay-descriptors/microdescs/consen…" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/relay-descriptors/microdescs/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/relay-descriptors/microdescs/consen…" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/relay-descriptors/microdescs/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-microdescriptor">Microdescriptors</a></td> <td><code>@type microdescriptor 1.0</code></td> - <td><a href="https://collector.torproject.org/recent/relay-descriptors/microdescs/micro/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/relay-descriptors/microdescs/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/relay-descriptors/microdescs/micro/" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/relay-descriptors/microdescs/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-network-status-2">Version 2 Network Statuses</a></td> <td><code>@type network-status-2 1.0</code></td> - <td><a href="https://collector.torproject.org/archive/relay-descriptors/statuses/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/archive/relay-descriptors/statuses/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-directory">Version 1 Directories</a></td> <td><code>@type directory 1.0</code></td> - <td><a href="https://collector.torproject.org/archive/relay-descriptors/tor/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/archive/relay-descriptors/tor/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr class="tableHeadline"> <td colspan="3"><b><a href="#bridge-descriptors">Tor Bridge Descriptors</a></b></td> @@ -119,20 +119,20 @@ <tr> <td><a href="#type-bridge-network-status">Bridge Network Statuses</a></td> <td><code>@type bridge-network-status 1.1</code></td> - <td><a href="https://collector.torproject.org/recent/bridge-descriptors/statuses/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/bridge-descriptors/statuses/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/bridge-descriptors/statuses/" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/bridge-descriptors/statuses/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-bridge-server-descriptor">Bridge Server Descriptors</a></td> <td><code>@type bridge-server-descriptor 1.2</code></td> - <td><a href="https://collector.torproject.org/recent/bridge-descriptors/server-descripto…" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/bridge-descriptors/server-descript…" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/bridge-descriptors/server-descripto…" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/bridge-descriptors/server-descript…" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr> <td><a href="#type-bridge-extra-info">Bridge Extra-info Descriptors</a></td> <td><code>@type bridge-extra-info 1.3</code></td> - <td><a href="https://collector.torproject.org/recent/bridge-descriptors/extra-infos/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/bridge-descriptors/extra-infos/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/bridge-descriptors/extra-infos/" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/bridge-descriptors/extra-infos/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr class="tableHeadline"> <td colspan="3"><b><a href="#tor-hidden-service-descriptors">Tor Hidden Service Descriptors</a></b></td> @@ -148,7 +148,7 @@ <tr> <td><a href="#type-bridge-pool-assignment">Bridge Pool Assignments</a></td> <td><code>@type bridge-pool-assignment 1.0</code></td> - <td><a href="https://collector.torproject.org/archive/bridge-pool-assignments/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/archive/bridge-pool-assignments/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr class="tableHeadline"> <td colspan="3"><b><a href="#exit-lists">TorDNSEL's Exit Lists</a></b></td> @@ -156,8 +156,8 @@ <tr> <td><a href="#type-tordnsel">Exit Lists</a></td> <td><code>@type tordnsel 1.0</code></td> - <td><a href="https://collector.torproject.org/recent/exit-lists/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/exit-lists/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/exit-lists/" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/exit-lists/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> <tr class="tableHeadline"> <td colspan="3"><b><a href="#torperf">Torperf's Performance Data</a></b></td> @@ -165,8 +165,8 @@ <tr> <td><a href="#type-torperf">Torperf Measurement Results</a></td> <td><code>@type torperf 1.0</code></td> - <td><a href="https://collector.torproject.org/recent/torperf/" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> - <a href="https://collector.torproject.org/archive/torperf/" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> + <td><a href="https://collector.torproject.org/recent/torperf/" target="_blank" class="btn btn-primary btn-xs pull-left"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> + <a href="https://collector.torproject.org/archive/torperf/" target="_blank" class="btn btn-primary btn-xs pull-right"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a></td> </tr> </tbody> </table> @@ -204,17 +204,17 @@ number. Relays and directory authorities publish relay descriptors, so that clients can select relays for their paths through the Tor network. All these relay descriptors are specified in the -<a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor +<a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt" target="_blank">Tor directory protocol, version 3</a> specification document (or in the earlier protocol -<a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v2.txt">version 2</a> or -<a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v1.txt">version 1</a>). +<a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v2.txt" target="_blank">version 2</a> or +<a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v1.txt" target="_blank">version 1</a>). </p> <h3 id="type-server-descriptor" class="hover">Relay Server Descriptors <small><code>@type server-descriptor 1.0</code></small> -<a href="https://collector.torproject.org/recent/relay-descriptors/server-descriptor…" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/relay-descriptors/server-descripto…" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/relay-descriptors/server-descriptor…" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/server-descripto…" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-server-descriptor" class="anchor">#</a> </h3> @@ -231,8 +231,8 @@ file. <h3 id="type-extra-info" class="hover">Relay Extra-info Descriptors <small><code>@type extra-info 1.0</code></small> -<a href="https://collector.torproject.org/recent/relay-descriptors/extra-infos/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/relay-descriptors/extra-infos/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/relay-descriptors/extra-infos/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/extra-infos/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-extra-info" class="anchor">#</a> </h3> @@ -249,8 +249,8 @@ file. <h3 id="type-network-status-consensus-3" class="hover">Network Status Consensuses <small><code>@type network-status-consensus-3 1.0</code></small> -<a href="https://collector.torproject.org/recent/relay-descriptors/consensuses/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/relay-descriptors/consensuses/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/relay-descriptors/consensuses/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/consensuses/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-network-status-consensus-3" class="anchor">#</a> </h3> @@ -265,8 +265,8 @@ flags, heuristics used for relay selection, etc. <h3 id="type-network-status-vote-3" class="hover">Network Status Votes <small><code>@type network-status-vote-3 1.0</code></small> -<a href="https://collector.torproject.org/recent/relay-descriptors/votes/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/relay-descriptors/votes/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/relay-descriptors/votes/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/votes/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-network-status-vote-3" class="anchor">#</a> </h3> @@ -278,7 +278,7 @@ Vote documents are by far the largest documents provided here. <h3 id="type-dir-key-certificate-3" class="hover">Directory Key Certificates <small><code>@type dir-key-certificate-3 1.0</code></small> -<a href="https://collector.torproject.org/archive/relay-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-dir-key-certificate-3" class="anchor">#</a> </h3> @@ -291,8 +291,8 @@ available in a single descriptor archive tarball. <h3 id="type-network-status-microdesc-consensus-3" class="hover">Microdescriptor Consensuses <small><code>@type network-status-microdesc-consensus-3 1.0</code></small> -<a href="https://collector.torproject.org/recent/relay-descriptors/microdescs/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/relay-descriptors/microdescs/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/relay-descriptors/microdescs/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/microdescs/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-network-status-microdesc-consensus-3" class="anchor">#</a> </h3> @@ -309,8 +309,8 @@ together. <h3 id="type-microdescriptor" class="hover">Microdescriptors <small><code>@type microdescriptor 1.0</code></small> -<a href="https://collector.torproject.org/recent/relay-descriptors/microdescs/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/relay-descriptors/microdescs/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/relay-descriptors/microdescs/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/microdescs/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-microdescriptor" class="anchor">#</a> </h3> @@ -328,7 +328,7 @@ file. <h3 id="type-network-status-2" class="hover">Version 2 Network Statuses <small><code>@type network-status-2 1.0</code></small> -<a href="https://collector.torproject.org/archive/relay-descriptors/statuses/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/statuses/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-network-status-2" class="anchor">#</a> </h3> @@ -343,7 +343,7 @@ We stopped archiving version 2 network statuses in 2012. <h3 id="type-directory" class="hover">Version 1 Directories <small><code>@type directory 1.0</code></small> -<a href="https://collector.torproject.org/archive/relay-descriptors/tor/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/archive/relay-descriptors/tor/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-directory" class="anchor">#</a> </h3> @@ -451,8 +451,8 @@ descriptor including all signatures.</li> <h3 id="type-bridge-network-status" class="hover">Bridge Network Statuses <small><code>@type bridge-network-status 1.1</code></small> -<a href="https://collector.torproject.org/recent/bridge-descriptors/statuses/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/bridge-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/bridge-descriptors/statuses/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/bridge-descriptors/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-bridge-network-status" class="anchor">#</a> </h3> @@ -472,8 +472,8 @@ ports.</li> <h3 id="type-bridge-server-descriptor" class="hover">Bridge Server descriptors <small><code>@type bridge-server-descriptor 1.2</code></small> -<a href="https://collector.torproject.org/recent/bridge-descriptors/server-descripto…" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/bridge-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/bridge-descriptors/server-descripto…" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/bridge-descriptors/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-bridge-server-descriptor" class="anchor">#</a> </h3> @@ -506,8 +506,8 @@ ports.</li> <h3 id="type-bridge-extra-info" class="hover">Bridge Extra-info Descriptors <small><code>@type bridge-extra-info 1.3</code></small> -<a href="https://collector.torproject.org/recent/bridge-descriptors/extra-infos/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/bridge-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/bridge-descriptors/extra-infos/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/bridge-descriptors/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-bridge-extra-info" class="anchor">#</a> </h3> @@ -589,7 +589,7 @@ statistical analysis. <h3 id="type-bridge-pool-assignment" class="hover">Bridge Pool Assignments <small><code>@type bridge-pool-assignment 1.0</code></small> -<a href="https://collector.torproject.org/archive/bridge-pool-assignments/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/archive/bridge-pool-assignments/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-bridge-pool-assignment" class="anchor">#</a> </h3> @@ -641,15 +641,15 @@ archived. <p> The exit list service -<a href="https://www.torproject.org/tordnsel/dist/">TorDNSEL</a> +<a href="https://www.torproject.org/tordnsel/dist/" target="_blank">TorDNSEL</a> publishes exit lists containing the IP addresses of relays that it found when exiting through them. </p> <h3 id="type-tordnsel" class="hover">Exit Lists <small><code>@type tordnsel 1.0</code></small> -<a href="https://collector.torproject.org/recent/exit-lists/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/exit-lists/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/exit-lists/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/exit-lists/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-tordnsel" class="anchor">#</a> </h3> @@ -692,8 +692,8 @@ over the Tor network and notes how long substeps take. <h3 id="type-torperf" class="hover">Torperf Measurement Results <small><code>@type torperf 1.0</code></small> -<a href="https://collector.torproject.org/recent/torperf/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="https://collector.torproject.org/archive/torperf/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="https://collector.torproject.org/recent/torperf/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> +<a href="https://collector.torproject.org/archive/torperf/" target="_blank" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-torperf" class="anchor">#</a> </h3> @@ -801,7 +801,7 @@ wget --recursive \ # turn on recursive retrieving <h2 id="index-json" class="hover">Custom downloaders using provided <code>index.json</code> <a href="#index-json" class="anchor">#</a></h2> -<p>Another automated way to download descriptors is to develop a tool that uses the provided <a href="https://collector.torproject.org/index/index.json"><code>index.json</code></a> file or one of its compressed versions <a href="https://collector.torproject.org/index/index.json.gz"><code>index.json.gz</code></a>, <a href="https://collector.torproject.org/index/index.json.bz2"><code>index.json.bz2</code></a>, or <a href="https://collector.torproject.org/index/index.json.xz"><code>index.json.xz</code></a>. +<p>Another automated way to download descriptors is to develop a tool that uses the provided <a href="https://collector.torproject.org/index/index.json" target="_blank"><code>index.json</code></a> file or one of its compressed versions <a href="https://collector.torproject.org/index/index.json.gz" target="_blank"><code>index.json.gz</code></a>, <a href="https://collector.torproject.org/index/index.json.bz2" target="_blank"><code>index.json.bz2</code></a>, or <a href="https://collector.torproject.org/index/index.json.xz" target="_blank"><code>index.json.xz</code></a>. These files contain a machine-readable representation of all descriptor files available on this site. Index files use the following custom JSON data format that might still be extended at a later time:</p> <ul> diff --git a/website/src/main/resources/web/WEB-INF/glossary.jsp b/website/src/main/resources/web/WEB-INF/glossary.jsp index edde87d..a617b21 100644 --- a/website/src/main/resources/web/WEB-INF/glossary.jsp +++ b/website/src/main/resources/web/WEB-INF/glossary.jsp @@ -39,7 +39,7 @@ authority:</a></b> a special-purpose <a href="#relay">relay</a> that maintains a list of bridges as input for external bridge distribution mechanisms (for example, - <a href="https://bridges.torproject.org/">BridgeDB</a>).</p> + <a href="https://bridges.torproject.org/" target="_blank">BridgeDB</a>).</p> <p id="circuit"><b><a href="#circuit">circuit:</a></b> a path through the Tor network @@ -103,7 +103,7 @@ example, "Fast", "Stable"), or roles (for example, "Authority", "HSDir"), as assigned by the <a href="#directory-authority">directory authorities</a> and further defined in the - <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">directory + <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt" target="_blank">directory protocol specification</a>.</p> </div> diff --git a/website/src/main/resources/web/WEB-INF/index.jsp b/website/src/main/resources/web/WEB-INF/index.jsp index 11217ea..56e2afa 100644 --- a/website/src/main/resources/web/WEB-INF/index.jsp +++ b/website/src/main/resources/web/WEB-INF/index.jsp @@ -15,7 +15,7 @@ <div class="container"> <h1>Welcome!</h1> <p> - What would you like to know about the <a href="https://www.torproject.org/">Tor</a> network? + What would you like to know about the <a href="https://www.torproject.org/" target="_blank">Tor</a> network? </p> </div> diff --git a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp b/website/src/main/resources/web/WEB-INF/metrics-lib.jsp index 4188a42..3cd26f6 100644 --- a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp +++ b/website/src/main/resources/web/WEB-INF/metrics-lib.jsp @@ -19,8 +19,8 @@ <div class="text-center"> <h2>Tor Metrics Library</h2> <p>Tor Metrics Library is a Java API that facilitates processing Tor network data from the <a href="collector.html">CollecTor</a> service for statistical analysis and for building services and applications.</p> -<a class="btn btn-primary btn-lg" style="margin: 10px" href="https://dist.torproject.org/metrics-lib/?C=M;O=D"><i class="fa fa-chevron-right" aria-hidden="true"></i> Download Release</a> -<a class="btn btn-primary btn-lg" style="margin: 10px" href="https://gitweb.torproject.org/metrics-lib.git/plain/CHANGELOG.md"><i class="fa fa-chevron-right" aria-hidden="true"></i> View Change Log</a> +<a class="btn btn-primary btn-lg" style="margin: 10px" href="https://dist.torproject.org/metrics-lib/?C=M;O=D" target="_blank"><i class="fa fa-chevron-right" aria-hidden="true"></i> Download Release</a> +<a class="btn btn-primary btn-lg" style="margin: 10px" href="https://gitweb.torproject.org/metrics-lib.git/plain/CHANGELOG.md" target="_blank"><i class="fa fa-chevron-right" aria-hidden="true"></i> View Change Log</a> <a class="btn btn-primary btn-lg" style="margin: 10px" href="metrics-lib/"><i class="fa fa-chevron-right" aria-hidden="true"></i> Browse JavaDocs</a> </div> </div> @@ -42,13 +42,13 @@ <h2 id="prerequisites">Prerequisites and preparation <a href="#prerequisites" class="anchor">#</a></h2> -<p>The following tutorials are written with an audience in mind that knows Java and to a lesser extent how Tor works. We explain all data used in the tutorials. More and most up-to-date information about descriptors can be found in the <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor directory protocol specification</a> and on the <a href="collector.html">CollecTor page</a>.</p> +<p>The following tutorials are written with an audience in mind that knows Java and to a lesser extent how Tor works. We explain all data used in the tutorials. More and most up-to-date information about descriptors can be found in the <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt" target="_blank">Tor directory protocol specification</a> and on the <a href="collector.html">CollecTor page</a>.</p> -<p>All tutorials require you to <a href="https://dist.torproject.org/descriptor/?C=M;O=D">download</a> the latest release of metrics-lib, follow the instructions to <a href="https://gitweb.torproject.org/metrics-lib.git/tree/README.md">verify</a> its signature, extract the tarball locally, and copy the <code>lib/</code> and the <code>generated/</code> directories to your working directory for the tutorials.</p> +<p>All tutorials require you to <a href="https://dist.torproject.org/descriptor/?C=M;O=D" target="_blank">download</a> the latest release of metrics-lib, follow the instructions to <a href="https://gitweb.torproject.org/metrics-lib.git/tree/README.md" target="_blank">verify</a> its signature, extract the tarball locally, and copy the <code>lib/</code> and the <code>generated/</code> directories to your working directory for the tutorials.</p> <h2 id="tutorial1">Tutorial 1: Download descriptors from CollecTor <a href="#tutorial1" class="anchor">#</a></h2> -<p>Let's start this tutorial series by doing something really simple. We'll use metrics-lib to download <a href="https://collector.torproject.org/recent/relay-descriptors/consensuses/">recent consensuses from CollecTor</a> and write them to a local directory. We're not doing anything with those consensuses yet, though we'll get back to that in a bit.</p> +<p>Let's start this tutorial series by doing something really simple. We'll use metrics-lib to download <a href="https://collector.torproject.org/recent/relay-descriptors/consensuses/" target="_blank">recent consensuses from CollecTor</a> and write them to a local directory. We're not doing anything with those consensuses yet, though we'll get back to that in a bit.</p> <p>We'll need to tell metrics-lib five pieces of information for this:</p> @@ -296,9 +296,9 @@ java -cp .:lib/\*:generated/dist/signed/\* PluggableTransports <p>Want to write more code that uses metrics-lib? Be sure to read the <a href="metrics-lib/">JavaDocs</a> while developing new services or applications using Tor network data.</p> -<p>Ran into a problem, found a bug, or came up with a cool new feature? Feel free to <a href="https://metrics.torproject.org/about.html#contact">contact us</a>. Alternatively, take a look at the <a href="https://trac.torproject.org/projects/tor">bug tracker</a> and open a ticket if there's none for your issue yet.</p> +<p>Ran into a problem, found a bug, or came up with a cool new feature? Feel free to <a href="about.html#contact">contact us</a>. Alternatively, take a look at the <a href="https://trac.torproject.org/projects/tor" target="_blank">bug tracker</a> and open a ticket if there's none for your issue yet.</p> -<p>Interested in writing <a href="https://gitweb.torproject.org/metrics-lib.git/">code</a> for metrics-lib? Please take a look at the Tor Metrics team <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/MetricsTeam/Volunte…">wiki page</a> to find out how to contribute.</p> +<p>Interested in writing <a href="https://gitweb.torproject.org/metrics-lib.git/" target="_blank">code</a> for metrics-lib? Please take a look at the Tor Metrics team <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/MetricsTeam/Volunte…" target="_blank">wiki page</a> to find out how to contribute.</p> <p>Scrolled down just to see where we're hiding the solutions of the three little riddles above? Here are the diffs:</p> diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index 228ec59..b349b7a 100644 --- a/website/src/main/resources/web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -682,7 +682,7 @@ Omitted if zero. <a id="summary"></a><br> <h2>Summary documents <a href="#summary" class="anchor">#</a> <span class="request-response"> -<a href="https://onionoo.torproject.org/summary?limit=4">example request</a> +<a href="https://onionoo.torproject.org/summary?limit=4" target="_blank">example request</a> </span> </h2> @@ -787,7 +787,7 @@ running in the last bridge network status. <a id="details"></a><br> <h2>Details documents <a href="#details" class="anchor">#</a> <span class="request-response"> -<a href="https://onionoo.torproject.org/details?limit=4">example request</a> +<a href="https://onionoo.torproject.org/details?limit=4" target="_blank">example request</a> </span> </h2> @@ -1549,7 +1549,7 @@ graphs. <a id="bandwidth"></a><br> <h2>Bandwidth documents <a href="#bandwidth" class="anchor">#</a> <span class="request-response"> -<a href="https://onionoo.torproject.org/bandwidth?limit=4">example request</a> +<a href="https://onionoo.torproject.org/bandwidth?limit=4" target="_blank">example request</a> </span> </h2> @@ -1668,7 +1668,7 @@ The specification of graph history objects is similar to those in the <a id="weights"></a><br> <h2>Weights documents <a href="#weights" class="anchor">#</a> <span class="request-response"> -<a href="https://onionoo.torproject.org/weights?limit=4">example request</a> +<a href="https://onionoo.torproject.org/weights?limit=4" target="_blank">example request</a> </span> </h2> @@ -1788,7 +1788,7 @@ The specification of this history object is similar to that in the <a id="clients"></a><br> <h2>Clients documents <a href="#clients" class="anchor">#</a> <span class="request-response"> -<a href="https://onionoo.torproject.org/clients?limit=4">example request</a> +<a href="https://onionoo.torproject.org/clients?limit=4" target="_blank">example request</a> </span> </h2> @@ -1909,7 +1909,7 @@ It might be removed in the future without notice.</span> <a id="uptime"></a><br> <h2>Uptime documents <a href="#uptime" class="anchor">#</a> <span class="request-response"> -<a href="https://onionoo.torproject.org/uptime?limit=4">example request</a> +<a href="https://onionoo.torproject.org/uptime?limit=4" target="_blank">example request</a> </span> </h2> @@ -2025,7 +2025,7 @@ information. <p> <code>/summary?limit=4</code> -(<a href="https://onionoo.torproject.org/summary?limit=4">view result</a>) +(<a href="https://onionoo.torproject.org/summary?limit=4" target="_blank">view result</a>) </p> <p> @@ -2037,7 +2037,7 @@ new queries to avoid downloading huge responses. <p> <code>/summary?limit=4&search=moria</code> -(<a href="https://onionoo.torproject.org/summary?limit=4&search=moria">view result</a>) +(<a href="https://onionoo.torproject.org/summary?limit=4&search=moria" target="_blank">view result</a>) </p> <p> @@ -2047,7 +2047,7 @@ string "moria" in one of a few searched fields. <p> <code>/details?limit=4&search=moria</code> -(<a href="https://onionoo.torproject.org/details?limit=4&search=moria">view result</a>) +(<a href="https://onionoo.torproject.org/details?limit=4&search=moria" target="_blank">view result</a>) </p> <p> @@ -2057,7 +2057,7 @@ details documents containing, well, more details. <p> <code>/details?limit=4&search=moria&fields=nickname</code> -(<a href="https://onionoo.torproject.org/details?limit=4&search=moria&fields=nickname">view result</a>) +(<a href="https://onionoo.torproject.org/details?limit=4&search=moria&fields=nickname" target="_blank">view result</a>) </p> <p> @@ -2068,7 +2068,7 @@ This parameter is only implemented for details documents. <p> <code>/details?limit=4&search=moria&fields=nickname&order=-consensus_weight</code> -(<a href="https://onionoo.torproject.org/details?limit=4&search=moria&fields=nickname…">view result</a>) +(<a href="https://onionoo.torproject.org/details?limit=4&search=moria&fields=nickname…" target="_blank">view result</a>) </p> <p> diff --git a/website/src/main/resources/web/WEB-INF/stats.jsp b/website/src/main/resources/web/WEB-INF/stats.jsp index fd3fd6d..7912834 100644 --- a/website/src/main/resources/web/WEB-INF/stats.jsp +++ b/website/src/main/resources/web/WEB-INF/stats.jsp @@ -315,7 +315,7 @@ there are users by either of the two numbers.</li> <p>The following data file contains aggregate statistics on performance when downloading static files of different sizes over Tor. These statistics are -generated by the <a href="https://gitweb.torproject.org/torperf.git">Torperf</a> +generated by the <a href="https://gitweb.torproject.org/torperf.git" target="_blank">Torperf</a> tool, which periodically fetches static files over Tor and records several timestamps in the process. The data file contains daily medians and quartiles as well as total numbers of requests, timeouts, and failures. Raw Torperf @@ -463,9 +463,9 @@ small subset of <a href="glossary.html#relay">relays</a> and extrapolated to network totals. Statistics include the amount of onion-service traffic and the number of onion-service addresses in the network per day. For more details on the extrapolation algorithm, see <a -href="https://blog.torproject.org/blog/some-statistics-about-onions">this blog +href="https://blog.torproject.org/blog/some-statistics-about-onions" target="_blank">this blog post</a> and <a -href="https://research.torproject.org/techreports/extrapolating-hidserv-stats-201…">this +href="https://research.torproject.org/techreports/extrapolating-hidserv-stats-201…" target="_blank">this technical report</a>.</p> <p><b>Download as <a href="stats/hidserv.csv">CSV file</a>.</b></p> diff --git a/website/src/main/resources/web/css/style.css b/website/src/main/resources/web/css/style.css index c93d9cf..6d39105 100644 --- a/website/src/main/resources/web/css/style.css +++ b/website/src/main/resources/web/css/style.css @@ -451,6 +451,10 @@ a[target="_blank"]:before { margin-right:3px; } +a.btn[target="_blank"]:before { + content: ""; +} + /* news page */

1 0

[metrics-web/master] Fix button text color of visited links.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit 65d31bceb7a54f2d8880309452d6c54c97ccc4bf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 20 14:29:17 2017 +0100 Fix button text color of visited links. --- website/src/main/resources/web/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/website/src/main/resources/web/css/style.css b/website/src/main/resources/web/css/style.css index 70764ad..273260a 100644 --- a/website/src/main/resources/web/css/style.css +++ b/website/src/main/resources/web/css/style.css @@ -120,6 +120,7 @@ body { /* primary button color */ .btn-primary { + color: #fff !important; background-color: #8d56A8; border-color: #7d4698; }

1 0

[metrics-web/master] Include Onionoo-specific styles.
by karsten＠torproject.org 06 Jul '17

06 Jul '17

commit 81b410e5d6d2aae2946d7e4f2a999f2160b28062 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 20 14:37:09 2017 +0100 Include Onionoo-specific styles. --- website/src/main/resources/web/WEB-INF/onionoo.jsp | 2 +- website/src/main/resources/web/css/style.css | 52 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index 32d7cea..228ec59 100644 --- a/website/src/main/resources/web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -13,7 +13,7 @@ </ul> </div> - <div class="container"> + <div class="container onionoo"> <br><br> diff --git a/website/src/main/resources/web/css/style.css b/website/src/main/resources/web/css/style.css index 273260a..c93d9cf 100644 --- a/website/src/main/resources/web/css/style.css +++ b/website/src/main/resources/web/css/style.css @@ -852,3 +852,55 @@ body.noscript #navbar-toggle-checkbox:checked ~ .collapse { .style .token.string { color: #000; /* black */ } + + +/* Onionoo-specific Styles */ + +.onionoo a .fa.fa-chevron-right { + font-size:70%; +} +.onionoo .required-true { +} +.onionoo .required-false { + color: #aaa; +} +.onionoo .properties { + margin-top: 10px; + margin-bottom: 10px; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; + border-bottom: 1px solid #ddd; + padding:0; +} +.onionoo .request-response { + float:right; + font-size:60%; +} +.onionoo .properties li { + padding: 15px; + overflow:hidden; + border-top:1px solid #ddd; +} +.onionoo .properties li:nth-child(odd) { + background: #f8f8f8; +} +.onionoo h4, .onionoo .h4 { font-size: 16px; } + +/* method table */ +@media only screen and (max-width: 767.99999px) { + .onionoo .responsive-table td:before { + width: 25% !important; + } + .onionoo .responsive-table td { + padding-left: 30% !important; + } +} +.onionoo th.method { width:10%; } +.onionoo th.url { width:40%; } +.onionoo th.description { width:50%; } +.onionoo span.red { + color:#d9534f; +} +.onionoo span.blue { + color:#337ab7; +}

1 0