[tor-commits] [metrics-web/master] Add related metrics to pages.
karsten at torproject.org
karsten at torproject.org
Tue Nov 25 14:51:39 UTC 2014
commit da35698d717838433347d09a918120ecb8e636f3
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Tue Nov 25 15:37:06 2014 +0100
Add related metrics to pages.
---
website/web/WEB-INF/advbwdist-data.jsp | 6 ++++++
website/web/WEB-INF/advbwdist-perc.jsp | 7 ++++++-
website/web/WEB-INF/advbwdist-relay.jsp | 7 ++++++-
website/web/WEB-INF/bandwidth-data.jsp | 9 +++++++++
website/web/WEB-INF/bandwidth-flags.jsp | 10 +++++++++-
website/web/WEB-INF/bandwidth.jsp | 9 ++++++++-
website/web/WEB-INF/bwhist-flags.jsp | 10 +++++++++-
website/web/WEB-INF/clients-data.jsp | 12 ++++++++++++
website/web/WEB-INF/cloudbridges.jsp | 7 ++++++-
website/web/WEB-INF/connbidirect-data.jsp | 5 +++++
website/web/WEB-INF/connbidirect.jsp | 6 +++++-
website/web/WEB-INF/dirbytes.jsp | 9 ++++++++-
website/web/WEB-INF/networksize.jsp | 10 +++++++++-
website/web/WEB-INF/oxford-anonymous-internet.jsp | 7 +++++++
website/web/WEB-INF/platforms.jsp | 9 ++++++++-
website/web/WEB-INF/relayflags.jsp | 9 ++++++++-
website/web/WEB-INF/servers-data.jsp | 9 +++++++++
website/web/WEB-INF/torperf-data.jsp | 6 ++++++
website/web/WEB-INF/torperf-failures.jsp | 8 +++++++-
website/web/WEB-INF/torperf.jsp | 8 +++++++-
website/web/WEB-INF/userstats-bridge-country.jsp | 9 ++++++++-
website/web/WEB-INF/userstats-bridge-table.jsp | 12 +++++++++++-
website/web/WEB-INF/userstats-bridge-transport.jsp | 9 ++++++++-
website/web/WEB-INF/userstats-bridge-version.jsp | 9 ++++++++-
website/web/WEB-INF/userstats-censorship-events.jsp | 10 +++++++++-
website/web/WEB-INF/userstats-relay-country.jsp | 11 ++++++++++-
website/web/WEB-INF/userstats-relay-table.jsp | 12 +++++++++++-
website/web/WEB-INF/versions.jsp | 9 ++++++++-
28 files changed, 223 insertions(+), 21 deletions(-)
diff --git a/website/web/WEB-INF/advbwdist-data.jsp b/website/web/WEB-INF/advbwdist-data.jsp
index e6c655c..10fa543 100644
--- a/website/web/WEB-INF/advbwdist-data.jsp
+++ b/website/web/WEB-INF/advbwdist-data.jsp
@@ -46,6 +46,12 @@ fastest relays.</li>
<li><b>advbw:</b> Advertised bandwidth in B/s.</li>
</ul>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="advbwdist-perc.html">Graph: Advertised bandwidth distribution</a></li>
+<li><a href="advbwdist-relay.html">Graph: Advertised bandwidth of n-th fastest relays</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/advbwdist-perc.jsp b/website/web/WEB-INF/advbwdist-perc.jsp
index 73f86d4..6906727 100644
--- a/website/web/WEB-INF/advbwdist-perc.jsp
+++ b/website/web/WEB-INF/advbwdist-perc.jsp
@@ -71,9 +71,14 @@ amount).</p>
<p>Download graph as
<a href="advbwdist-perc.pdf${advbwdist_perc_url}">PDF</a> or
<a href="advbwdist-perc.svg${advbwdist_perc_url}">SVG</a>.</p>
-<p><a href="stats/advbwdist.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="advbwdist-relay.html">Graph: Advertised bandwidth of n-th fastest relays</a></li>
+<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/advbwdist-relay.jsp b/website/web/WEB-INF/advbwdist-relay.jsp
index 190e74f..6f7f300 100644
--- a/website/web/WEB-INF/advbwdist-relay.jsp
+++ b/website/web/WEB-INF/advbwdist-relay.jsp
@@ -58,9 +58,14 @@ n-th fastest relays in the network for different values of n.</p>
<p>Download graph as
<a href="advbwdist-relay.pdf${advbwdist_relay_url}">PDF</a> or
<a href="advbwdist-relay.svg${advbwdist_relay_url}">SVG</a>.</p>
-<p><a href="stats/advbwdist.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="advbwdist-perc.html">Graph: Advertised bandwidth distribution</a></li>
+<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/bandwidth-data.jsp b/website/web/WEB-INF/bandwidth-data.jsp
index 8bd2079..8d401ae 100644
--- a/website/web/WEB-INF/bandwidth-data.jsp
+++ b/website/web/WEB-INF/bandwidth-data.jsp
@@ -58,6 +58,15 @@ flags, so that this column will contain the empty string if either
relays when serving directory data.</li>
</ul>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="bandwidth.html">Graph: Total relay bandwidth in the network</a></li>
+<li><a href="bwhist-flags.html">Graph: Relay bandwidth by Exit and/or Guard flags</a></li>
+<li><a href="bandwidth-flags.html">Graph: Advertised bandwidth and bandwidth history by relay flags</a></li>
+<li><a href="dirbytes.html">Graph: Number of bytes spent on answering directory requests</a></li>
+<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/bandwidth-flags.jsp b/website/web/WEB-INF/bandwidth-flags.jsp
index 7934fa4..a2d154b 100644
--- a/website/web/WEB-INF/bandwidth-flags.jsp
+++ b/website/web/WEB-INF/bandwidth-flags.jsp
@@ -43,9 +43,17 @@ These sets are not distinct, because a relay that has both the "Exit" and
<p>Download graph as
<a href="bandwidth-flags.pdf${bandwidth_flags_url}">PDF</a> or
<a href="bandwidth-flags.svg${bandwidth_flags_url}">SVG</a>.</p>
-<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li>
+<li><a href="bandwidth.html">Graph: Total relay bandwidth in the network</a></li>
+<li><a href="bwhist-flags.html">Graph: Relay bandwidth by Exit and/or Guard flags</a></li>
+<li><a href="dirbytes.html">Graph: Number of bytes spent on answering directory requests</a></li>
+<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/bandwidth.jsp b/website/web/WEB-INF/bandwidth.jsp
index d06d053..6c78dc5 100644
--- a/website/web/WEB-INF/bandwidth.jsp
+++ b/website/web/WEB-INF/bandwidth.jsp
@@ -61,9 +61,16 @@ Sorry for any inconvenience caused by this.</p>
<p>Download graph as
<a href="bandwidth.pdf${bandwidth_url}">PDF</a> or
<a href="bandwidth.svg${bandwidth_url}">SVG</a>.</p>
-<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="bwhist-flags.html">Graph: Relay bandwidth by Exit and/or Guard flags</a></li>
+<li><a href="bandwidth-flags.html">Graph: Advertised bandwidth and bandwidth history by relay flags</a></li>
+<li><a href="dirbytes.html">Graph: Number of bytes spent on answering directory requests</a></li>
+<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/bwhist-flags.jsp b/website/web/WEB-INF/bwhist-flags.jsp
index 941bd1b..a550b06 100644
--- a/website/web/WEB-INF/bwhist-flags.jsp
+++ b/website/web/WEB-INF/bwhist-flags.jsp
@@ -40,9 +40,17 @@ relays, subdivided into four distinct subsets by assigned "Exit" and/or
<p>Download graph as
<a href="bwhist-flags.pdf${bwhist_flags_url}">PDF</a> or
<a href="bwhist-flags.svg${bwhist_flags_url}">SVG</a>.</p>
-<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li>
+<li><a href="bandwidth.html">Graph: Total relay bandwidth in the network</a></li>
+<li><a href="bandwidth-flags.html">Graph: Advertised bandwidth and bandwidth history by relay flags</a></li>
+<li><a href="dirbytes.html">Graph: Number of bytes spent on answering directory requests</a></li>
+<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/clients-data.jsp b/website/web/WEB-INF/clients-data.jsp
index f315b1a..ec80e33 100644
--- a/website/web/WEB-INF/clients-data.jsp
+++ b/website/web/WEB-INF/clients-data.jsp
@@ -74,6 +74,18 @@ Values above 50 can be considered reliable enough for most purposes,
lower values should be handled with more care.</li>
</ul>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li>
+<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li>
+<li><a href="userstats-censorship-events.html">Table: Top-10 countries by possible censorship events</a></li>
+<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li>
+<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li>
+<li><a href="userstats-bridge-transport.html">Graph: Bridge users by transport</a></li>
+<li><a href="userstats-bridge-version.html">Graph: Bridge users by IP version</a></li>
+<li><a href="oxford-anonymous-internet.html">Link: Tor users as percentage of larger Internet population</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/cloudbridges.jsp b/website/web/WEB-INF/cloudbridges.jsp
index b17fd27..c470a40 100644
--- a/website/web/WEB-INF/cloudbridges.jsp
+++ b/website/web/WEB-INF/cloudbridges.jsp
@@ -43,9 +43,14 @@ which bridge operators usually leave unchanged.</p>
<p>Download graph as
<a href="cloudbridges.pdf${cloudbridges_url}">PDF</a> or
<a href="cloudbridges.svg${cloudbridges_url}">SVG</a>.</p>
-<p><a href="stats/servers.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="networksize.html">Graph: Relays and bridges in the network</a></li>
+<li><a href="servers-data.html">Data: Number of relays and bridges</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/connbidirect-data.jsp b/website/web/WEB-INF/connbidirect-data.jsp
index 83fee07..c343585 100644
--- a/website/web/WEB-INF/connbidirect-data.jsp
+++ b/website/web/WEB-INF/connbidirect-data.jsp
@@ -48,6 +48,11 @@ than 10 times as many written or read bytes as in the other
direction.</li>
</ul>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="connbidirect.html">Graph: Fraction of connections used uni-/bidirectionally</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/connbidirect.jsp b/website/web/WEB-INF/connbidirect.jsp
index c305745..d6f06a6 100644
--- a/website/web/WEB-INF/connbidirect.jsp
+++ b/website/web/WEB-INF/connbidirect.jsp
@@ -51,9 +51,13 @@ fractions.</p>
<p>Download graph as
<a href="connbidirect.pdf${connbidirect_url}">PDF</a> or
<a href="connbidirect.svg${connbidirect_url}">SVG</a>.</p>
-<p><a href="stats/connbidirect.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="connbidirect-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/dirbytes.jsp b/website/web/WEB-INF/dirbytes.jsp
index b9f1dfc..e628b12 100644
--- a/website/web/WEB-INF/dirbytes.jsp
+++ b/website/web/WEB-INF/dirbytes.jsp
@@ -44,9 +44,16 @@ directories reported these statistics.</p>
<p>Download graph as
<a href="dirbytes.pdf${dirbytes_url}">PDF</a> or
<a href="dirbytes.svg${dirbytes_url}">SVG</a>.</p>
-<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="bandwidth.html">Graph: Total relay bandwidth in the network</a></li>
+<li><a href="bwhist-flags.html">Graph: Relay bandwidth by Exit and/or Guard flags</a></li>
+<li><a href="bandwidth-flags.html">Graph: Advertised bandwidth and bandwidth history by relay flags</a></li>
+<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/networksize.jsp b/website/web/WEB-INF/networksize.jsp
index 62b4e48..30af831 100644
--- a/website/web/WEB-INF/networksize.jsp
+++ b/website/web/WEB-INF/networksize.jsp
@@ -39,9 +39,17 @@
<p>Download graph as
<a href="networksize.pdf${networksize_url}">PDF</a> or
<a href="networksize.svg${networksize_url}">SVG</a>.</p>
-<p><a href="stats/servers.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li>
+<li><a href="versions.html">Graph: Relays by version</a></li>
+<li><a href="platforms.html">Graph: Relays by platform</a></li>
+<li><a href="cloudbridges.html">Graph: Tor Cloud bridges</a></li>
+<li><a href="servers-data.html">Data: Number of relays and bridges</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/oxford-anonymous-internet.jsp b/website/web/WEB-INF/oxford-anonymous-internet.jsp
index fd18a01..bc659d0 100644
--- a/website/web/WEB-INF/oxford-anonymous-internet.jsp
+++ b/website/web/WEB-INF/oxford-anonymous-internet.jsp
@@ -30,6 +30,13 @@ website at the Oxford Internet Institute</a>.</p>
alt="The anonymous Internet">
</a>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li>
+<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li>
+<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/platforms.jsp b/website/web/WEB-INF/platforms.jsp
index b422a96..d3d89c5 100644
--- a/website/web/WEB-INF/platforms.jsp
+++ b/website/web/WEB-INF/platforms.jsp
@@ -40,9 +40,16 @@ network.</p>
<p>Download graph as
<a href="platforms.pdf${platforms_url}">PDF</a> or
<a href="platforms.svg${platforms_url}">SVG</a>.</p>
-<p><a href="stats/servers.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="networksize.html">Graph: Relays and bridges in the network</a></li>
+<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li>
+<li><a href="versions.html">Graph: Relays by version</a></li>
+<li><a href="servers-data.html">Data: Number of relays and bridges</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/relayflags.jsp b/website/web/WEB-INF/relayflags.jsp
index 98e31ab..b885a8a 100644
--- a/website/web/WEB-INF/relayflags.jsp
+++ b/website/web/WEB-INF/relayflags.jsp
@@ -53,9 +53,16 @@ is considered a hidden service directory ("HSDir").</p>
<p>Download graph as
<a href="relayflags.pdf${relayflags_url}">PDF</a> or
<a href="relayflags.svg${relayflags_url}">SVG</a>.</p>
-<p><a href="stats/servers.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="networksize.html">Graph: Relays and bridges in the network</a></li>
+<li><a href="versions.html">Graph: Relays by version</a></li>
+<li><a href="platforms.html">Graph: Relays by platform</a></li>
+<li><a href="servers-data.html">Data: Number of relays and bridges</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/servers-data.jsp b/website/web/WEB-INF/servers-data.jsp
index 307a77b..d455d6e 100644
--- a/website/web/WEB-INF/servers-data.jsp
+++ b/website/web/WEB-INF/servers-data.jsp
@@ -80,6 +80,15 @@ If the values in previous columns are specific to relays only, this column
contains the empty string.</li>
</ul>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="networksize.html">Graph: Relays and bridges in the network</a></li>
+<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li>
+<li><a href="versions.html">Graph: Relays by version</a></li>
+<li><a href="platforms.html">Graph: Relays by platform</a></li>
+<li><a href="cloudbridges.html">Graph: Tor Cloud bridges</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/torperf-data.jsp b/website/web/WEB-INF/torperf-data.jsp
index 6b78270..5dc0af2 100644
--- a/website/web/WEB-INF/torperf-data.jsp
+++ b/website/web/WEB-INF/torperf-data.jsp
@@ -49,6 +49,12 @@ download the static file over Tor.</li>
file over Tor.</li>
</ul>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="torperf.html">Graph: Time to download files over Tor</a></li>
+<li><a href="torperf-failures.html">Graph: Timeouts and failures of downloading files over Tor</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/torperf-failures.jsp b/website/web/WEB-INF/torperf-failures.jsp
index bfd9f0a..7897fab 100644
--- a/website/web/WEB-INF/torperf-failures.jsp
+++ b/website/web/WEB-INF/torperf-failures.jsp
@@ -53,7 +53,13 @@ than expected.</p>
<p>Download graph as
<a href="torperf-failures.pdf${torperf_failures_url}">PDF</a> or
<a href="torperf-failures.svg${torperf_failures_url}">SVG</a>.</p>
-<p><a href="stats/torperf.csv">CSV</a> file containing all data.</p>
+<br>
+
+<h4>Related metrics</h4>
+<ul>
+<li><a href="torperf.html">Graph: Time to download files over Tor</a></li>
+<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li>
+</ul>
</div>
</div>
diff --git a/website/web/WEB-INF/torperf.jsp b/website/web/WEB-INF/torperf.jsp
index 61002d4..90aa880 100644
--- a/website/web/WEB-INF/torperf.jsp
+++ b/website/web/WEB-INF/torperf.jsp
@@ -52,7 +52,13 @@ graph.</p>
<p>Download graph as
<a href="torperf.pdf${torperf_url}">PDF</a> or
<a href="torperf.svg${torperf_url}">SVG</a>.</p>
-<p><a href="stats/torperf.csv">CSV</a> file containing all data.</p>
+<br>
+
+<h4>Related metrics</h4>
+<ul>
+<li><a href="torperf-failures.html">Graph: Timeouts and failures of downloading files over Tor</a></li>
+<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li>
+</ul>
</div>
</div>
diff --git a/website/web/WEB-INF/userstats-bridge-country.jsp b/website/web/WEB-INF/userstats-bridge-country.jsp
index 44aa32c..2cbe715 100644
--- a/website/web/WEB-INF/userstats-bridge-country.jsp
+++ b/website/web/WEB-INF/userstats-bridge-country.jsp
@@ -49,10 +49,17 @@ country codes, so that graphs are available for most countries.</p>
<p>Download graph as
<a href="userstats-bridge-country.pdf${userstats_bridge_country_url}">PDF</a> or
<a href="userstats-bridge-country.svg${userstats_bridge_country_url}">SVG</a>.
-<a href="stats/clients.csv">CSV</a> file containing user estimates.
<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.txt">Questions
and answers about users statistics</a></p>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li>
+<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li>
+<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li>
+<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/userstats-bridge-table.jsp b/website/web/WEB-INF/userstats-bridge-table.jsp
index b32369f..2b300e4 100644
--- a/website/web/WEB-INF/userstats-bridge-table.jsp
+++ b/website/web/WEB-INF/userstats-bridge-table.jsp
@@ -50,10 +50,20 @@ country codes, so that numbers are available for most countries.</p>
</tr>
</c:forEach>
</table>
-<p><a href="stats/clients.csv">CSV</a> file containing user estimates.
+<p>
<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.txt">Questions
and answers about users statistics</a></p>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li>
+<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li>
+<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li>
+<li><a href="userstats-bridge-transport.html">Graph: Bridge users by transport</a></li>
+<li><a href="userstats-bridge-version.html">Graph: Bridge users by IP version</a></li>
+<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/userstats-bridge-transport.jsp b/website/web/WEB-INF/userstats-bridge-transport.jsp
index ed06992..629c093 100644
--- a/website/web/WEB-INF/userstats-bridge-transport.jsp
+++ b/website/web/WEB-INF/userstats-bridge-transport.jsp
@@ -55,10 +55,17 @@ so that graphs are available for different transports.</p>
<p>Download graph as
<a href="userstats-bridge-transport.pdf${userstats_bridge_transport_url}">PDF</a> or
<a href="userstats-bridge-transport.svg${userstats_bridge_transport_url}">SVG</a>.
-<a href="stats/clients.csv">CSV</a> file containing user estimates.
<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.txt">Questions
and answers about users statistics</a></p>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li>
+<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li>
+<li><a href="userstats-bridge-version.html">Graph: Bridge users by IP version</a></li>
+<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/userstats-bridge-version.jsp b/website/web/WEB-INF/userstats-bridge-version.jsp
index 2e69b20..4cf4292 100644
--- a/website/web/WEB-INF/userstats-bridge-version.jsp
+++ b/website/web/WEB-INF/userstats-bridge-version.jsp
@@ -47,10 +47,17 @@ available for both IP versions 4 and 6.</p>
<p>Download graph as
<a href="userstats-bridge-version.pdf${userstats_bridge_version_url}">PDF</a> or
<a href="userstats-bridge-version.svg${userstats_bridge_version_url}">SVG</a>.
-<a href="stats/clients.csv">CSV</a> file containing user estimates.
<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.txt">Questions
and answers about users statistics</a></p>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li>
+<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li>
+<li><a href="userstats-bridge-transport.html">Graph: Bridge users by transport</a></li>
+<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/userstats-censorship-events.jsp b/website/web/WEB-INF/userstats-censorship-events.jsp
index bc5552f..0f82f8a 100644
--- a/website/web/WEB-INF/userstats-censorship-events.jsp
+++ b/website/web/WEB-INF/userstats-censorship-events.jsp
@@ -50,10 +50,18 @@ more details, see this
</tr>
</c:forEach>
</table>
-<p><a href="stats/clients.csv">CSV</a> file containing user estimates.
+<p>
<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.txt">Questions
and answers about users statistics</a></p>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li>
+<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li>
+<li><a href="userstats-censorship-events.html">Table: Top-10 countries by possible censorship events</a></li>
+<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/userstats-relay-country.jsp b/website/web/WEB-INF/userstats-relay-country.jsp
index d7b3f8f..2723241 100644
--- a/website/web/WEB-INF/userstats-relay-country.jsp
+++ b/website/web/WEB-INF/userstats-relay-country.jsp
@@ -63,10 +63,19 @@ details, see this
<p>Download graph as
<a href="userstats-relay-country.pdf${userstats_relay_country_url}">PDF</a> or
<a href="userstats-relay-country.svg${userstats_relay_country_url}">SVG</a>.
-<a href="stats/clients.csv">CSV</a> file containing user estimates.
<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.txt">Questions
and answers about users statistics</a></p>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li>
+<li><a href="userstats-censorship-events.html">Table: Top-10 countries by possible censorship events</a></li>
+<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li>
+<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li>
+<li><a href="oxford-anonymous-internet.html">Link: Tor users as percentage of larger Internet population</a></li>
+<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/userstats-relay-table.jsp b/website/web/WEB-INF/userstats-relay-table.jsp
index c84b2d2..c36c7a2 100644
--- a/website/web/WEB-INF/userstats-relay-table.jsp
+++ b/website/web/WEB-INF/userstats-relay-table.jsp
@@ -51,10 +51,20 @@ available for most countries.</p>
</tr>
</c:forEach>
</table>
-<p><a href="stats/clients.csv">CSV</a> file containing user estimates.
+<p>
<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.txt">Questions
and answers about users statistics</a></p>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li>
+<li><a href="userstats-censorship-events.html">Table: Top-10 countries by possible censorship events</a></li>
+<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li>
+<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li>
+<li><a href="oxford-anonymous-internet.html">Link: Tor users as percentage of larger Internet population</a></li>
+<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/website/web/WEB-INF/versions.jsp b/website/web/WEB-INF/versions.jsp
index 2ae5bba..ebbef39 100644
--- a/website/web/WEB-INF/versions.jsp
+++ b/website/web/WEB-INF/versions.jsp
@@ -45,9 +45,16 @@ and in the
<p>Download graph as
<a href="versions.pdf${versions_url}">PDF</a> or
<a href="versions.svg${versions_url}">SVG</a>.</p>
-<p><a href="stats/servers.csv">CSV</a> file containing all data.</p>
<br>
+<h4>Related metrics</h4>
+<ul>
+<li><a href="networksize.html">Graph: Relays and bridges in the network</a></li>
+<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li>
+<li><a href="platforms.html">Graph: Relays by platform</a></li>
+<li><a href="servers-data.html">Data: Number of relays and bridges</a></li>
+</ul>
+
</div>
</div>
<div class="bottom" id="bottom">
More information about the tor-commits
mailing list