November 2014 - tor-commits - lists.torproject.org

[metrics-web/master] Remove temporary notices.
by karsten＠torproject.org 25 Nov '14

25 Nov '14

commit d57004ea242ccaeda2c1f7e5c2bdcfb12bc20ec6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 25 16:39:58 2014 +0100 Remove temporary notices. --- website/web/WEB-INF/bandwidth.jsp | 21 --------------------- website/web/WEB-INF/bubbles.jsp | 14 -------------- 2 files changed, 35 deletions(-) diff --git a/website/web/WEB-INF/bandwidth.jsp b/website/web/WEB-INF/bandwidth.jsp index 3d84d59..f3b22b1 100644 --- a/website/web/WEB-INF/bandwidth.jsp +++ b/website/web/WEB-INF/bandwidth.jsp @@ -14,27 +14,6 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h2><a href="/">Tor Metrics</a> — Bandwidth</h2> -<br> -<p>The graphs on this page (except one) have moved to their own subpages. -This is part of an effort to make navigation on this website more intuitive. -In the future, this notice will go away, and all graphs/tables can be searched more easily from the start page. -Sorry for any inconvenience caused by this.</p> - -<ul> -<li>Graph: Total relay bandwidth in the network (see below)</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="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> -<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li> -<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li> -</ul> -<br> -<hr> -<br> - <h2><a href="/">Tor Metrics</a> — Total relay bandwidth in the network</h2> <br> <p>The following graph shows the total diff --git a/website/web/WEB-INF/bubbles.jsp b/website/web/WEB-INF/bubbles.jsp index eb57a04..e8d0303 100644 --- a/website/web/WEB-INF/bubbles.jsp +++ b/website/web/WEB-INF/bubbles.jsp @@ -14,20 +14,6 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h2><a href="/">Tor Metrics</a> — Diversity</h2> -<br> -<p>The graph on this page will soon move to its own subpages. -This is part of an effort to make navigation on this website more intuitive. -In the future, this notice will go away, and all graphs/tables can be searched more easily from the start page. -Sorry for any inconvenience caused by this.</p> - -<ul> -<li>Graph: Network bubble graphs (see below)</li> -</ul> -<br> -<hr> -<br> - <h2><a href="/">Tor Metrics</a> — Network bubble graphs</h2> <br> <p>The following graph visualizes diversity of currently running

1 0

[metrics-web/master] Remove navigation bar.
by karsten＠torproject.org 25 Nov '14

25 Nov '14

commit 3359b4f845e997569bc4ca1e1fff71630b5079f7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 25 16:37:19 2014 +0100 Remove navigation bar. --- website/web/WEB-INF/about.jsp | 4 ++-- website/web/WEB-INF/advbwdist-data.jsp | 6 +++--- website/web/WEB-INF/advbwdist-perc.jsp | 4 ++-- website/web/WEB-INF/advbwdist-relay.jsp | 4 ++-- website/web/WEB-INF/bandwidth-data.jsp | 4 ++-- website/web/WEB-INF/bandwidth-flags.jsp | 4 ++-- website/web/WEB-INF/bandwidth.jsp | 6 +++--- website/web/WEB-INF/banner.jsp | 16 ---------------- website/web/WEB-INF/bubbles.jsp | 6 +++--- website/web/WEB-INF/bwhist-flags.jsp | 4 ++-- website/web/WEB-INF/clients-data.jsp | 4 ++-- website/web/WEB-INF/cloudbridges.jsp | 4 ++-- website/web/WEB-INF/connbidirect-data.jsp | 4 ++-- website/web/WEB-INF/connbidirect.jsp | 4 ++-- website/web/WEB-INF/dir.jsp | 4 ++-- website/web/WEB-INF/dirbytes.jsp | 4 ++-- website/web/WEB-INF/error.jsp | 4 ++-- website/web/WEB-INF/footer.jsp | 1 + website/web/WEB-INF/index.jsp | 2 +- website/web/WEB-INF/network.jsp | 4 ++-- website/web/WEB-INF/networksize.jsp | 4 ++-- website/web/WEB-INF/oxford-anonymous-internet.jsp | 4 ++-- website/web/WEB-INF/performance.jsp | 4 ++-- website/web/WEB-INF/platforms.jsp | 4 ++-- website/web/WEB-INF/relayflags.jsp | 4 ++-- website/web/WEB-INF/servers-data.jsp | 4 ++-- website/web/WEB-INF/stats.jsp | 5 +++-- website/web/WEB-INF/torperf-data.jsp | 4 ++-- website/web/WEB-INF/torperf-failures.jsp | 4 ++-- website/web/WEB-INF/torperf.jsp | 4 ++-- website/web/WEB-INF/users.jsp | 4 ++-- website/web/WEB-INF/userstats-bridge-country.jsp | 4 ++-- website/web/WEB-INF/userstats-bridge-table.jsp | 4 ++-- website/web/WEB-INF/userstats-bridge-transport.jsp | 4 ++-- website/web/WEB-INF/userstats-bridge-version.jsp | 4 ++-- website/web/WEB-INF/userstats-censorship-events.jsp | 4 ++-- website/web/WEB-INF/userstats-relay-country.jsp | 4 ++-- website/web/WEB-INF/userstats-relay-table.jsp | 4 ++-- website/web/WEB-INF/versions.jsp | 4 ++-- 39 files changed, 78 insertions(+), 92 deletions(-) diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp index 57d0155..7d3e51b 100644 --- a/website/web/WEB-INF/about.jsp +++ b/website/web/WEB-INF/about.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: About</title> + <title>Tor Metrics — About</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="../css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,7 +10,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics: About</h2> +<h2><a href="/">Tor Metrics</a> — About</h2> <br> <h3>Frequently used terms</h3> diff --git a/website/web/WEB-INF/advbwdist-data.jsp b/website/web/WEB-INF/advbwdist-data.jsp index 10fa543..c7d1768 100644 --- a/website/web/WEB-INF/advbwdist-data.jsp +++ b/website/web/WEB-INF/advbwdist-data.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Advertised bandwidth distribution and n-th fastest relays</title> + <title>Tor Metrics — Advertised bandwidth distribution and n-th fastest relays</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,8 +13,8 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Advertised bandwidth distribution and n-th fastest -relays</h3> +<h2><a href="/">Tor Metrics</a> — Advertised bandwidth distribution and n-th fastest +relays</h2> <br> <p>The following data file contains statistics on the distribution of <a href="about.html#advertised-bandwidth">advertised bandwidth</a> of diff --git a/website/web/WEB-INF/advbwdist-perc.jsp b/website/web/WEB-INF/advbwdist-perc.jsp index 6906727..c51902b 100644 --- a/website/web/WEB-INF/advbwdist-perc.jsp +++ b/website/web/WEB-INF/advbwdist-perc.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Advertised bandwidth distribution</title> + <title>Tor Metrics — Advertised bandwidth distribution</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Advertised bandwidth distribution</h3> +<h2><a href="/">Tor Metrics</a> — Advertised bandwidth distribution</h2> <br> <p>The following graph shows the distribution of the <a href="about.html#advertised-bandwidth">advertised bandwidth</a> of diff --git a/website/web/WEB-INF/advbwdist-relay.jsp b/website/web/WEB-INF/advbwdist-relay.jsp index 6f7f300..0de9400 100644 --- a/website/web/WEB-INF/advbwdist-relay.jsp +++ b/website/web/WEB-INF/advbwdist-relay.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Advertised bandwidth of n-th fastest relays</title> + <title>Tor Metrics — Advertised bandwidth of n-th fastest relays</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Advertised bandwidth of n-th fastest relays</h3> +<h2><a href="/">Tor Metrics</a> — Advertised bandwidth of n-th fastest relays</h2> <br> <p>The following graph shows the <a href="about.html#advertised-bandwidth">advertised bandwidth</a> of the diff --git a/website/web/WEB-INF/bandwidth-data.jsp b/website/web/WEB-INF/bandwidth-data.jsp index 8d401ae..2499e4a 100644 --- a/website/web/WEB-INF/bandwidth-data.jsp +++ b/website/web/WEB-INF/bandwidth-data.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Bandwidth provided and consumed by relays</title> + <title>Tor Metrics — Bandwidth provided and consumed by relays</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Bandwidth provided and consumed by relays</h3> +<h2><a href="/">Tor Metrics</a> — Bandwidth provided and consumed by relays</h2> <br> <p>The following data file contains statistics on <a href="about.html#advertised-bandwidth">advertised</a> and diff --git a/website/web/WEB-INF/bandwidth-flags.jsp b/website/web/WEB-INF/bandwidth-flags.jsp index a2d154b..7207b9b 100644 --- a/website/web/WEB-INF/bandwidth-flags.jsp +++ b/website/web/WEB-INF/bandwidth-flags.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Advertised bandwidth and bandwidth history by relay flags</title> + <title>Tor Metrics — Advertised bandwidth and bandwidth history by relay flags</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Advertised bandwidth and bandwidth history by relay flags</h3> +<h2><a href="/">Tor Metrics</a> — Advertised bandwidth and bandwidth history by relay flags</h2> <br> <p>The following graph shows <a href="about.html#advertised-bandwidth">advertised</a> and diff --git a/website/web/WEB-INF/bandwidth.jsp b/website/web/WEB-INF/bandwidth.jsp index 6c78dc5..3d84d59 100644 --- a/website/web/WEB-INF/bandwidth.jsp +++ b/website/web/WEB-INF/bandwidth.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Total relay bandwidth in the network</title> + <title>Tor Metrics — Total relay bandwidth in the network</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics: Bandwidth</h2> +<h2><a href="/">Tor Metrics</a> — Bandwidth</h2> <br> <p>The graphs on this page (except one) have moved to their own subpages. This is part of an effort to make navigation on this website more intuitive. @@ -35,7 +35,7 @@ Sorry for any inconvenience caused by this.</p> <hr> <br> -<h3>Tor Metrics: Total relay bandwidth in the network</h3> +<h2><a href="/">Tor Metrics</a> — Total relay bandwidth in the network</h2> <br> <p>The following graph shows the total <a href="about.html#advertised-bandwidth">advertised</a> and diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp index 3127b26..e69de29 100644 --- a/website/web/WEB-INF/banner.jsp +++ b/website/web/WEB-INF/banner.jsp @@ -1,16 +0,0 @@ -<table class="banner" border="0" cellpadding="0" cellspacing="0" summary=""> -<tr> - <td class="banner-left"> - <a href="/index.html"> - <img src="/images/top-left.png" alt="Click to go to home page" - width="193" height="79"></a></td> - <td class="banner-middle"> - <% String currentPage = request.getRequestURI(); %> - <a <% if (currentPage.endsWith("index.jsp")) { - %>class="current"<%} else {%>href="/index.html"<%}%>>Home</a> - <a <% if (currentPage.endsWith("about.jsp")) { - %>class="current"<%} else {%>href="/about.html"<%}%>>About</a> - </td> - <td class="banner-right"></td> -</tr> -</table> diff --git a/website/web/WEB-INF/bubbles.jsp b/website/web/WEB-INF/bubbles.jsp index 118d23f..eb57a04 100644 --- a/website/web/WEB-INF/bubbles.jsp +++ b/website/web/WEB-INF/bubbles.jsp @@ -2,7 +2,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Network bubble graphs</title> + <title>Tor Metrics — Network bubble graphs</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics: Diversity</h2> +<h2><a href="/">Tor Metrics</a> — Diversity</h2> <br> <p>The graph on this page will soon move to its own subpages. This is part of an effort to make navigation on this website more intuitive. @@ -28,7 +28,7 @@ Sorry for any inconvenience caused by this.</p> <hr> <br> -<h3>Tor Metrics: Network bubble graphs</h3> +<h2><a href="/">Tor Metrics</a> — Network bubble graphs</h2> <br> <p>The following graph visualizes diversity of currently running <a href="about.html#relay">relays</a> in terms of their probability to be diff --git a/website/web/WEB-INF/bwhist-flags.jsp b/website/web/WEB-INF/bwhist-flags.jsp index a550b06..36e3cd5 100644 --- a/website/web/WEB-INF/bwhist-flags.jsp +++ b/website/web/WEB-INF/bwhist-flags.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Relay bandwidth by Exit and/or Guard flags</title> + <title>Tor Metrics — Relay bandwidth by Exit and/or Guard flags</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Relay bandwidth by Exit and/or Guard flags</h3> +<h2><a href="/">Tor Metrics</a> — Relay bandwidth by Exit and/or Guard flags</h2> <br> <p>The following graph shows the <a href="about.html#bandwidth-history">consumed bandwidth</a> reported by diff --git a/website/web/WEB-INF/clients-data.jsp b/website/web/WEB-INF/clients-data.jsp index ec80e33..a6dcbc3 100644 --- a/website/web/WEB-INF/clients-data.jsp +++ b/website/web/WEB-INF/clients-data.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Estimated number of clients in the Tor network</title> + <title>Tor Metrics — Estimated number of clients in the Tor network</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Estimated number of clients in the Tor network</h3> +<h2><a href="/">Tor Metrics</a> — Estimated number of clients in the Tor network</h2> <br> <p>The following data file contains estimates on the number of <a href="about.html#client">clients</a> in the network. diff --git a/website/web/WEB-INF/cloudbridges.jsp b/website/web/WEB-INF/cloudbridges.jsp index c470a40..df80a34 100644 --- a/website/web/WEB-INF/cloudbridges.jsp +++ b/website/web/WEB-INF/cloudbridges.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Tor Cloud bridges</title> + <title>Tor Metrics — Tor Cloud bridges</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -15,7 +15,7 @@ <div class="main-column"> <a name="cloudbridges"></a> -<h3>Tor Metrics: Tor Cloud bridges</h3> +<h2><a href="/">Tor Metrics</a> — Tor Cloud bridges</h2> <br> <p>The following graph shows the number of running <a href="about.html#bridge">bridges</a> that are deployed in diff --git a/website/web/WEB-INF/connbidirect-data.jsp b/website/web/WEB-INF/connbidirect-data.jsp index c343585..51c78a7 100644 --- a/website/web/WEB-INF/connbidirect-data.jsp +++ b/website/web/WEB-INF/connbidirect-data.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Fraction of connections used uni-/bidirectionally</title> + <title>Tor Metrics — Fraction of connections used uni-/bidirectionally</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Fraction of connections used uni-/bidirectionally</h3> +<h2><a href="/">Tor Metrics</a> — Fraction of connections used uni-/bidirectionally</h2> <br> <p>The following data file contains statistics on the fraction of direct connections between a <a href="about.html#relay">relay</a> and other nodes diff --git a/website/web/WEB-INF/connbidirect.jsp b/website/web/WEB-INF/connbidirect.jsp index d6f06a6..affa329 100644 --- a/website/web/WEB-INF/connbidirect.jsp +++ b/website/web/WEB-INF/connbidirect.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Fraction of connections used uni-/bidirectionally</title> + <title>Tor Metrics — Fraction of connections used uni-/bidirectionally</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Fraction of connections used uni-/bidirectionally</h3> +<h2><a href="/">Tor Metrics</a> — Fraction of connections used uni-/bidirectionally</h2> <br> <p>The following graph shows the fraction of direct connections between a <a href="about.html#relay">relay</a> and other nodes in the network that diff --git a/website/web/WEB-INF/dir.jsp b/website/web/WEB-INF/dir.jsp index ac4aca3..9aa3cb9 100644 --- a/website/web/WEB-INF/dir.jsp +++ b/website/web/WEB-INF/dir.jsp @@ -2,7 +2,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Index of ${directory}</title> + <title>Tor Metrics — Index of ${directory}</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -11,7 +11,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics: Index of ${directory}</h2> + <h2><a href="/">Tor Metrics</a> — Index of ${directory}</h2> <br> <c:forEach var="file" items="${files}" > <a href="${directory}/${file}${extension}">${file}${extension}</a><br> diff --git a/website/web/WEB-INF/dirbytes.jsp b/website/web/WEB-INF/dirbytes.jsp index e628b12..384f71c 100644 --- a/website/web/WEB-INF/dirbytes.jsp +++ b/website/web/WEB-INF/dirbytes.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Number of bytes spent on answering directory requests</title> + <title>Tor Metrics — Number of bytes spent on answering directory requests</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Number of bytes spent on answering directory requests</h3> +<h2><a href="/">Tor Metrics</a> — Number of bytes spent on answering directory requests</h2> <br> <p>The following graph shows the portion of <a href="about.html#bandwidth-history">consumed bandwidth</a> that diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp index a0484dc..a712ef1 100644 --- a/website/web/WEB-INF/error.jsp +++ b/website/web/WEB-INF/error.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Error</title> + <title>Tor Metrics — Error</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -12,7 +12,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics: Error</h2> +<h2><a href="/">Tor Metrics</a> — Error</h2> <br> <p> Oops! Something went wrong here! We encountered a diff --git a/website/web/WEB-INF/footer.jsp b/website/web/WEB-INF/footer.jsp index cab9e7f..a4feba7 100644 --- a/website/web/WEB-INF/footer.jsp +++ b/website/web/WEB-INF/footer.jsp @@ -1,3 +1,4 @@ + <p><a href="about.html">About Tor Metrics</a></p> <p>This material is supported in part by the National Science Foundation under Grant No. CNS-0959138. Any opinions, finding, and conclusions or recommendations expressed in this diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp index bc9148d..92fd44d 100644 --- a/website/web/WEB-INF/index.jsp +++ b/website/web/WEB-INF/index.jsp @@ -10,7 +10,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics</h2> + <h2><a href="/">Tor Metrics</a></h2> <br> <p>Welcome to Tor Metrics, the primary place to learn interesting facts about the Tor network, the largest deployed anonymity diff --git a/website/web/WEB-INF/network.jsp b/website/web/WEB-INF/network.jsp index 83216b0..4b43420 100644 --- a/website/web/WEB-INF/network.jsp +++ b/website/web/WEB-INF/network.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Servers</title> + <title>Tor Metrics — Servers</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics: Servers</h2> +<h2><a href="/">Tor Metrics</a> — Servers</h2> <br> <p>The graphs on this page have moved to their own subpages. diff --git a/website/web/WEB-INF/networksize.jsp b/website/web/WEB-INF/networksize.jsp index 30af831..24d00d8 100644 --- a/website/web/WEB-INF/networksize.jsp +++ b/website/web/WEB-INF/networksize.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Relays and bridges in the network</title> + <title>Tor Metrics — Relays and bridges in the network</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Relays and bridges in the network</h3> +<h2><a href="/">Tor Metrics</a> — Relays and bridges in the network</h2> <br> <p>The following graph shows the number of running <a href="about.html#relay">relays</a> and diff --git a/website/web/WEB-INF/oxford-anonymous-internet.jsp b/website/web/WEB-INF/oxford-anonymous-internet.jsp index bc659d0..3fa46d6 100644 --- a/website/web/WEB-INF/oxford-anonymous-internet.jsp +++ b/website/web/WEB-INF/oxford-anonymous-internet.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Tor users as percentage of larger Internet population</title> + <title>Tor Metrics — Tor users as percentage of larger Internet population</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Tor users as percentage of larger Internet population</h3> +<h2><a href="/">Tor Metrics</a> — Tor users as percentage of larger Internet population</h2> <br> <p>The Oxford Internet Institute made a cartogram visualization of Tor users as compared to the overall Internet population. diff --git a/website/web/WEB-INF/performance.jsp b/website/web/WEB-INF/performance.jsp index dd5d980..04231d3 100644 --- a/website/web/WEB-INF/performance.jsp +++ b/website/web/WEB-INF/performance.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Performance</title> + <title>Tor Metrics — Performance</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics: Performance</h2> +<h2><a href="/">Tor Metrics</a> — Performance</h2> <br> <p>The graphs on this page have moved to their own subpages. This is part of an effort to make navigation on this website more intuitive. diff --git a/website/web/WEB-INF/platforms.jsp b/website/web/WEB-INF/platforms.jsp index d3d89c5..2a223c0 100644 --- a/website/web/WEB-INF/platforms.jsp +++ b/website/web/WEB-INF/platforms.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Relays by platform</title> + <title>Tor Metrics — Relays by platform</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Relays by platform</a></h3> +<h2><a href="/">Tor Metrics</a> — Relays by platform</a></h2> <br> <p>The following graph shows the number of running <a href="about.html#relay">relays</a> by operating system. diff --git a/website/web/WEB-INF/relayflags.jsp b/website/web/WEB-INF/relayflags.jsp index b885a8a..d0c3e1f 100644 --- a/website/web/WEB-INF/relayflags.jsp +++ b/website/web/WEB-INF/relayflags.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Relays with Exit, Fast, Guard, Stable, and HSDir flags</title> + <title>Tor Metrics — Relays with Exit, Fast, Guard, Stable, and HSDir flags</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Relays with Exit, Fast, Guard, Stable, and HSDir flags</h3> +<h2><a href="/">Tor Metrics</a> — Relays with Exit, Fast, Guard, Stable, and HSDir flags</h2> <br> <p>The following graph shows the number of running diff --git a/website/web/WEB-INF/servers-data.jsp b/website/web/WEB-INF/servers-data.jsp index d455d6e..a28269f 100644 --- a/website/web/WEB-INF/servers-data.jsp +++ b/website/web/WEB-INF/servers-data.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Number of relays and bridges</title> + <title>Tor Metrics — Number of relays and bridges</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Number of relays and bridges</h3> +<h2><a href="/">Tor Metrics</a> — Number of relays and bridges</h2> <br> <p>The following data file contains the number of running <a href="about.html#relay">relays</a> and diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp index 21a0e07..6a807ac 100644 --- a/website/web/WEB-INF/stats.jsp +++ b/website/web/WEB-INF/stats.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Statistics</title> + <title>Tor Metrics — Statistics</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,7 +10,8 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics: Statistics</h2> + +<h2><a href="/">Tor Metrics</a> — Statistics</h2> <br> <p>The data file specifications on this page have moved to their own subpages. This is part of an effort to make navigation on this website more intuitive. diff --git a/website/web/WEB-INF/torperf-data.jsp b/website/web/WEB-INF/torperf-data.jsp index 5dc0af2..fc9d55c 100644 --- a/website/web/WEB-INF/torperf-data.jsp +++ b/website/web/WEB-INF/torperf-data.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Performance of downloading static files over Tor</title> + <title>Tor Metrics — Performance of downloading static files over Tor</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Performance of downloading static files over Tor</h3> +<h2><a href="/">Tor Metrics</a> — Performance of downloading static files over Tor</h2> <br> <p>The following data file contains aggregate statistics on performance when downloading static files of different sizes over Tor. diff --git a/website/web/WEB-INF/torperf-failures.jsp b/website/web/WEB-INF/torperf-failures.jsp index 7897fab..154423f 100644 --- a/website/web/WEB-INF/torperf-failures.jsp +++ b/website/web/WEB-INF/torperf-failures.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Timeouts and failures of downloading files over Tor</title> + <title>Tor Metrics — Timeouts and failures of downloading files over Tor</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Timeouts and failures of downloading files over Tor</h3> +<h2><a href="/">Tor Metrics</a> — Timeouts and failures of downloading files over Tor</h2> <br> <p>The following graph shows the fraction of timeouts and failures when downloading static files of different sizes over Tor. diff --git a/website/web/WEB-INF/torperf.jsp b/website/web/WEB-INF/torperf.jsp index 90aa880..562c210 100644 --- a/website/web/WEB-INF/torperf.jsp +++ b/website/web/WEB-INF/torperf.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Time to download files over Tor</title> + <title>Tor Metrics — Time to download files over Tor</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Time to download files over Tor</h3> +<h2><a href="/">Tor Metrics</a> — Time to download files over Tor</h2> <br> <p>The following graph shows overall performance when downloading static files of different sizes over Tor. diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp index 015eea9..0b693a4 100644 --- a/website/web/WEB-INF/users.jsp +++ b/website/web/WEB-INF/users.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Users</title> + <title>Tor Metrics — Users</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics: Users</h2> +<h2><a href="/">Tor Metrics</a> — Users</h2> <br> <p>The graphs and tables on this page have moved to their own subpages. diff --git a/website/web/WEB-INF/userstats-bridge-country.jsp b/website/web/WEB-INF/userstats-bridge-country.jsp index 2cbe715..814d33d 100644 --- a/website/web/WEB-INF/userstats-bridge-country.jsp +++ b/website/web/WEB-INF/userstats-bridge-country.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Bridge users by country</title> + <title>Tor Metrics — Bridge users by country</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Bridge users by country</h3> +<h2><a href="/">Tor Metrics</a> — Bridge users by country</h2> <br> <p>The following graph shows the estimated number of <a href="about.html#client">clients</a> connecting via diff --git a/website/web/WEB-INF/userstats-bridge-table.jsp b/website/web/WEB-INF/userstats-bridge-table.jsp index 2b300e4..a243399 100644 --- a/website/web/WEB-INF/userstats-bridge-table.jsp +++ b/website/web/WEB-INF/userstats-bridge-table.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Top-10 countries by bridge users</title> + <title>Tor Metrics — Top-10 countries by bridge users</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Top-10 countries by bridge users</h3> +<h2><a href="/">Tor Metrics</a> — Top-10 countries by bridge users</h2> <br> <p>The following table shows the top-10 countries by estimated number of <a href="about.html#client">clients</a> connecting via diff --git a/website/web/WEB-INF/userstats-bridge-transport.jsp b/website/web/WEB-INF/userstats-bridge-transport.jsp index 629c093..b9e4e04 100644 --- a/website/web/WEB-INF/userstats-bridge-transport.jsp +++ b/website/web/WEB-INF/userstats-bridge-transport.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Bridge users by transport</title> + <title>Tor Metrics — Bridge users by transport</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Bridge users by transport</h3> +<h2><a href="/">Tor Metrics</a> — Bridge users by transport</h2> <br> <p>The following graph shows the estimated number of <a href="about.html#client">clients</a> connecting via diff --git a/website/web/WEB-INF/userstats-bridge-version.jsp b/website/web/WEB-INF/userstats-bridge-version.jsp index 4cf4292..a8ac85b 100644 --- a/website/web/WEB-INF/userstats-bridge-version.jsp +++ b/website/web/WEB-INF/userstats-bridge-version.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Bridge users by IP version</title> + <title>Tor Metrics — Bridge users by IP version</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Bridge users by IP version</h3> +<h2><a href="/">Tor Metrics</a> — Bridge users by IP version</h2> <br> <p>The following graph shows the estimated number of <a href="about.html#client">clients</a> connecting via diff --git a/website/web/WEB-INF/userstats-censorship-events.jsp b/website/web/WEB-INF/userstats-censorship-events.jsp index 0f82f8a..1400192 100644 --- a/website/web/WEB-INF/userstats-censorship-events.jsp +++ b/website/web/WEB-INF/userstats-censorship-events.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Top-10 countries by possible censorship events</title> + <title>Tor Metrics — Top-10 countries by possible censorship events</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Top-10 countries by possible censorship events</h3> +<h2><a href="/">Tor Metrics</a> — Top-10 countries by possible censorship events</h2> <br> <p>The following table shows the top-10 countries by possible censorship events, as obtained from an anomaly-based censorship-detection system (for diff --git a/website/web/WEB-INF/userstats-relay-country.jsp b/website/web/WEB-INF/userstats-relay-country.jsp index 2723241..c27afb1 100644 --- a/website/web/WEB-INF/userstats-relay-country.jsp +++ b/website/web/WEB-INF/userstats-relay-country.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Direct users by country</title> + <title>Tor Metrics — Direct users by country</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Direct users by country</h3> +<h2><a href="/">Tor Metrics</a> — Direct users by country</h2> <br> <p>The following graph shows the estimated number of directly-connecting <a href="about.html#client">clients</a>; that is, it excludes clients diff --git a/website/web/WEB-INF/userstats-relay-table.jsp b/website/web/WEB-INF/userstats-relay-table.jsp index c36c7a2..d565360 100644 --- a/website/web/WEB-INF/userstats-relay-table.jsp +++ b/website/web/WEB-INF/userstats-relay-table.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Top-10 countries by directly connecting users</title> + <title>Tor Metrics — Top-10 countries by directly connecting users</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Top-10 countries by directly connecting users</h3> +<h2><a href="/">Tor Metrics</a> — Top-10 countries by directly connecting users</h2> <br> <p>The following table shows the top-10 countries by estimated number of directly-connecting <a href="about.html#client">clients</a>. diff --git a/website/web/WEB-INF/versions.jsp b/website/web/WEB-INF/versions.jsp index ebbef39..2e516ce 100644 --- a/website/web/WEB-INF/versions.jsp +++ b/website/web/WEB-INF/versions.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics: Relays by version</title> + <title>Tor Metrics — Relays by version</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -14,7 +14,7 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Relays by version</h3> +<h2><a href="/">Tor Metrics</a> — Relays by version</h2> <br> <p>The following graph shows the number of running <a href="about.html#relay">relays</a> by tor software version.

1 0

[metrics-web/master] Remove category pages, move links to start page.
by karsten＠torproject.org 25 Nov '14

25 Nov '14

commit 8e964c0cffb0fac94ce846019eb05cf9649e6174 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 25 15:00:55 2014 +0100 Remove category pages, move links to start page. --- website/web/WEB-INF/banner.jsp | 12 --------- website/web/WEB-INF/index.jsp | 56 ++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 20 deletions(-) diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp index 07c09b2..3127b26 100644 --- a/website/web/WEB-INF/banner.jsp +++ b/website/web/WEB-INF/banner.jsp @@ -8,18 +8,6 @@ <% String currentPage = request.getRequestURI(); %> <a <% if (currentPage.endsWith("index.jsp")) { %>class="current"<%} else {%>href="/index.html"<%}%>>Home</a> - <a <% if (currentPage.endsWith("network.jsp")) { - %>class="current"<%} else {%>href="/network.html"<%}%>>Servers</a> - <a <% if (currentPage.endsWith("bandwidth.jsp")) { - %>class="current"<%} else {%>href="/bandwidth.html"<%}%>>Bandwidth</a> - <a <% if (currentPage.endsWith("bubbles.jsp")) { - %>class="current"<%} else {%>href="/bubbles.html"<%} - %>>Diversity</a> - <a <% if (currentPage.endsWith("users.jsp")) { - %>class="current"<%} else {%>href="/users.html"<%}%>>Users</a> - <a <% if (currentPage.endsWith("performance.jsp")) { - %>class="current"<%} else {%>href="/performance.html"<%} - %>>Performance</a> <a <% if (currentPage.endsWith("about.jsp")) { %>class="current"<%} else {%>href="/about.html"<%}%>>About</a> </td> diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp index c0e3c15..bc9148d 100644 --- a/website/web/WEB-INF/index.jsp +++ b/website/web/WEB-INF/index.jsp @@ -19,29 +19,69 @@ <p><small>*And if you come across something that is missing here, please let us know.</small></p> - <a href="network.html"><h3>Servers</h3></a> + <h3>Servers</h3> <p>How many relays and bridges are in the network? How many of them permit exiting?</p> +<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> +<li><a href="servers-data.html">Data: Number of relays and bridges</a></li> +</ul> - <a href="bandwidth.html"><h3>Bandwidth</h3></a> + <h3>Bandwidth</h3> <p>How much bandwidth do relays advertise? And how much of that is actually consumed?</p> - <a href="bubbles.html"><h3>Diversity</h3></a> +<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="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> +<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li> +<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li> +</ul> + + <h3>Diversity</h3> <p>How diverse is the network? In which countries are relays located?</p> - <a href="users.html"><h3>Users</h3></a> +<ul> +<li><a href="bubbles.html">Graph: Network bubble graphs</a></li> +</ul> + + <h3>Users</h3> <p>Where do users come from? What transports and IP versions are they using?</p> - <a href="performance.html"><h3>Performance</h3></a> +<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> +<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li> +</ul> + + <h3>Performance</h3> <p>How long does it take to download a megabyte of data over Tor? How about five?</p> - <a href="about.html"><h3>About</h3></a> - <p>How do you obtain all these facts in an anonymity network - without hurting user privacy?</p> +<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> +<li><a href="connbidirect.html">Graph: Fraction of connections used uni-/bidirectionally</a></li> +<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li> +<li><a href="connbidirect-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li> +</ul> + </div> </div> <div class="bottom" id="bottom">

1 0

[metrics-web/master] Add related metrics to pages.
by karsten＠torproject.org 25 Nov '14

25 Nov '14

commit da35698d717838433347d09a918120ecb8e636f3 Author: Karsten Loesing <karsten.loesing(a)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.…">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.…">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.…">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.…">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.…">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.…">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.…">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">

1 0

[metrics-web/master] Move data files to their own subpages.
by karsten＠torproject.org 25 Nov '14

25 Nov '14

commit c05e23cc466ee538f5fb5797d1b26dd4bd528ef0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 25 14:18:53 2014 +0100 Move data files to their own subpages. --- doc/stats-spec.txt | 256 +---------------- website/etc/web.xml | 6 + .../metrics/web/graphs/GraphsSubpagesServlet.java | 12 + website/web/WEB-INF/advbwdist-data.jsp | 56 ++++ website/web/WEB-INF/bandwidth-data.jsp | 68 +++++ website/web/WEB-INF/bandwidth.jsp | 2 + website/web/WEB-INF/clients-data.jsp | 84 ++++++ website/web/WEB-INF/connbidirect-data.jsp | 58 ++++ website/web/WEB-INF/network.jsp | 1 + website/web/WEB-INF/performance.jsp | 2 + website/web/WEB-INF/servers-data.jsp | 90 ++++++ website/web/WEB-INF/stats.jsp | 292 +------------------- website/web/WEB-INF/torperf-data.jsp | 59 ++++ website/web/WEB-INF/users.jsp | 1 + 14 files changed, 452 insertions(+), 535 deletions(-) diff --git a/doc/stats-spec.txt b/doc/stats-spec.txt index a0c45c3..85bb78e 100644 --- a/doc/stats-spec.txt +++ b/doc/stats-spec.txt @@ -5,260 +5,10 @@ Tor Metrics aggregates large amounts of Tor network data and visualizes results in customizable graphs and tables. All aggregated data are also available for download, so that people can easily plot their own graphs or even develop a prettier metrics website without writing their own data -aggregation code. Data formats of aggregate statistics are specified -below. +aggregation code. -Statistics files are available for download at: +Statistics files and data formats are available at: - https://metrics.torproject.org/stats/ + https://metrics.torproject.org/ -Number of relays and bridges ----------------------------- - -Statistics file servers.csv contains the average number of relays and -bridges in the Tor network. All averages are calculated per day by -evaluating the relay and bridge lists published by the directory -authorities. Statistics include subsets of relays or bridges by relay -flag (only relays), country code (only relays, only until February 2013), -Tor software version (only relays), operating system (only relays), and -EC2 cloud (only bridges). The statistics file contains the following -columns: - - - date: UTC date (YYYY-MM-DD) when relays or bridges have been listed as - running. - - - flag: Relay flag assigned by the directory authorities. Examples are - "Exit", "Guard", "Fast", "Stable", and "HSDir". Relays can have none, - some, or all these relay flags assigned. Relays that don't have the - "Running" flag are not included in these statistics regardless of their - other flags. If this column contains the empty string, all running - relays are included, regardless of assigned flags. There are no - statistics on the number of bridges by relay flag. - - - country: Two-letter lower-case country code as found in a GeoIP - database by resolving the relay's first onion-routing IP address, or - "??" if an IP addresses could not be resolved. If this column contains - the empty string, all running relays are included, regardless of their - resolved country code. Statistics on relays by country code are only - available until January 31, 2013. There are no statistics on the - number of bridges by country code. - - - version: First three dotted numbers of the Tor software version as - reported by the relay. An example is "0.2.5". If this column contains - the empty string, all running relays are included, regardless of the - Tor software version they run. There are no statistics on the number - of bridges by Tor software version. - - - platform: Operating system as reported by the relay. Examples are - "Linux", "Darwin" (Mac OS X), "FreeBSD", "Windows", and "Other". If - this column contains the empty string, all running relays are included, - regardless of the operating system they run on. There are no - statistics on the number of bridges by operating system. - - - ec2bridge: Whether bridges are running in the EC2 cloud or not. More - precisely, bridges in the EC2 cloud running an image provided by Tor by - default set their nickname to "ec2bridger" plus 8 random hex - characters. This column either contains "t" for bridges matching this - naming scheme, or the empty string for all bridges regardless of their - nickname. There are no statistics on the number of relays running in - the EC2 cloud. - - - relays: The average number of relays matching the criteria in the - previous columns. If the values in previous columns are specific to - bridges only, this column contains the empty string. - - - bridges: The average number of bridges matching the criteria in the - previous columns. If the values in previous columns are specific to - relays only, this column contains the empty string. - - -Bandwidth provided and consumed by relays ------------------------------------------ - -Statistics on bandwidth provided and consumed by relays are contained in -file bandwidth.csv. This file contains three different bandwidth metrics: -(1) bandwidth that relays are capable to provide and bandwidth that relays -report to have consumed, either (2) for any traffic, or (3) only traffic -from serving directory data. Relays providing bandwidth statistics are -categorized by having the "Exit" and "Guard" relay flag, having both, or -not having either. The statistics file contains the following columns: - - - date: UTC date (YYYY-MM-DD) that relays reported bandwidth data for. - - - isexit: Whether relays included in this line have the "Exit" relay flag - or not, which can be "t" or "f". If this column contains the empty - string, bandwidth data from all running relays are included, regardless - of assigned relay flags. - - - isguard: Whether relays included in this line have the "Guard" relay - flag or not, which can be "t" or "f". If this column contains the - empty string, bandwidth data from all running relays are included, - regardless of assigned relay flags. - - - advbw: Total advertised bandwidth in bytes per second that relays are - capable to provide. - - - bwread: Total bandwidth in bytes per second that relays have read. - This metric includes any kind of traffic. - - - bwwrite: Similar to bwread, but for traffic written by relays. - - - dirread: Bandwidth in bytes per second that relays have read when - serving directory data. Not all relays report how many bytes they read - when serving directory data which is why this value is an estimate from - the available data. This metric is not available for subsets of relays - with certain relay flags, so that this column will contain the empty - string if either isexit or isguard is non-empty. - - - dirwrite: Similar to dirread, but for traffic written by relays when - serving directory data. - - -Advertised bandwidth distribution and n-th fastest relays ---------------------------------------------------------- - -Statistics file advbwdist.csv contains statistics on the advertised -bandwidth of relays in the network. These statistics include advertised -bandwidth percentiles and advertised bandwidth values of the n-th fastest -relays. The statistics file contains the following columns: - - - date: UTC date (YYYY-MM-DD) when relays have been listed as running. - - - isexit: Whether relays included in this line have the "Exit" relay - flag, which would be indicated as "t". If this column contains the - empty string, advertised bandwidths from all running relays are - included, regardless of assigned relay flags. - - - relay: Position of the relay in an ordered list of all advertised - bandwidths, starting at 1 for the fastest relay in the network. May be - the empty string if this line contains advertised bandwidth by - percentile. - - - percentile: Advertised bandwidth percentile given in this line. May be - the empty string if this line contains advertised bandwidth by fastest - relays. - - - advbw: Advertised bandwidth in B/s. - - -Estimated number of clients in the Tor network ----------------------------------------------- - -Statistics file clients.csv contains estimates on the number of clients in -the Tor network. These estimates are based on the number of directory -requests counted on directory mirrors and bridges. Statistics are -available for clients connecting directly to the Tor network and clients -connecting via bridges. For relays, there exist statistics on the number -of clients by country, and for bridges, statistics are available by -country, by transport, and by IP version. Statistics further include -expected client numbers from past observations which can be used to detect -censorship or release of censorship. The statistics file contains the -following columns: - - - date: UTC date (YYYY-MM-DD) for which client numbers are estimated. - - - node: The node type to which clients connect first, which can be either - "relay" or "bridge". - - - country: Two-letter lower-case country code as found in a GeoIP - database by resolving clients' IP addresses, or "??" if client IP - addresses could not be resolved. If this column contains the empty - string, all clients are included, regardless of their country code. - - - transport: Transport name used by clients to connect to the Tor network - using bridges. Examples are "obfs2", "obfs3", "websocket", or "<OR>" - (original onion routing protocol). If this column contains the empty - string, all clients are included, regardless of their transport. There - are no statistics on the number of clients by transport that connect to - the Tor network via relays. - - - version: IP version used by clients to connect to the Tor network using - bridges. Examples are "v4" and "v6". If this column contains the - empty string, all clients are included, regardless of their IP version. - There are no statistics on the number of clients by IP version that - connect directly to the Tor network using relays. - - - lower: Lower number of expected clients under the assumption that there - has been no censorship event. If this column contains the empty - string, there are no expectations on the number of clients. - - - upper: Upper number of expected clients under the assumption that there - has been no release of censorship. If this column contains the empty - string, there are no expectations on the number of clients. - - - clients: Estimated number of clients. - - - frac: Fraction of relays or bridges in percent that the estimate is - based on. The higher this value, the more reliable is the estimate. - Values above 50 can be considered reliable enough for most purposes, - lower values should be handled with more care. - - -Performance of downloading static files over Tor ------------------------------------------------- - -Statistics file torperf.csv contains aggregate statistics on download -performance over time. These statistics come from the Torperf service -that periodically downloads static files over Tor. The statistics file -contains the following columns: - - - date: UTC date (YYYY-MM-DD) when download performance was measured. - - - size: Size of the downloaded file in bytes. - - - source: Name of the Torperf service performing measurements. If this - column contains the empty string, all measurements are included, - regardless of which Torperf service performed them. Examples are - "moria", "siv", and "torperf". - - - q1: First quartile of time until receiving the last byte in - milliseconds. - - - md: Median of time until receiving the last byte in milliseconds. - - - q3: Third quartile of time until receiving the last byte in - milliseconds. - - - timeouts: Number of timeouts that occurred when attempting to download - the static file over Tor. - - - failures: Number of failures that occurred when attempting to download - the static file over Tor. - - - requests: Total number of requests made to download the static file - over Tor. - - -Fraction of connections used uni-/bidirectionally -------------------------------------------------- - -Statistics file connbidirect.csv contains statistics on the fraction of -connections that is used uni- or bidirectionally. Every 10 seconds, -relays determine for every connection whether they read and wrote less -than a threshold of 20 KiB. For the remaining connections, relays report -whether they read/wrote at least 10 times as many bytes as they -wrote/read. If so, they classify a connection as "mostly reading" or -"mostly writing," respectively. All other connections are classified as -"both reading and writing." After classifying connections, read and write -counters are reset for the next 10-second interval. Statistics are -aggregated over 24 hours. The statistics file contains the following -columns: - - - date: UTC date (YYYY-MM-DD) for which statistics on uni-/bidirectional - connection usage were reported. - - - source: Fingerprint of the relay reporting statistics. - - - below: Number of 10-second intervals of connections with less than - 20 KiB read and written data. - - - read: Number of 10-second intervals of connections with 10 times as - many read bytes as written bytes. - - - write: Number of 10-second intervals of connections with 10 times as - many written bytes as read bytes. - - - both: Number of 10-second intervals of connections with less than - 10 times as many written or read bytes as in the other direction. - diff --git a/website/etc/web.xml b/website/etc/web.xml index cc5d076..25f4e7d 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -58,6 +58,12 @@ <url-pattern>/torperf.html</url-pattern> <url-pattern>/torperf-failures.html</url-pattern> <url-pattern>/connbidirect.html</url-pattern> + <url-pattern>/servers-data.html</url-pattern> + <url-pattern>/bandwidth-data.html</url-pattern> + <url-pattern>/advbwdist-data.html</url-pattern> + <url-pattern>/clients-data.html</url-pattern> + <url-pattern>/torperf-data.html</url-pattern> + <url-pattern>/connbidirect-data.html</url-pattern> </servlet-mapping> <servlet> diff --git a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java index 1d8a1e5..803969d 100644 --- a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java +++ b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java @@ -78,6 +78,18 @@ public class GraphsSubpagesServlet extends HttpServlet { "WEB-INF/torperf-failures.jsp"); this.availableGraphsSubpages.put("connbidirect.html", "WEB-INF/connbidirect.jsp"); + this.availableGraphsSubpages.put("servers-data.html", + "WEB-INF/servers-data.jsp"); + this.availableGraphsSubpages.put("bandwidth-data.html", + "WEB-INF/bandwidth-data.jsp"); + this.availableGraphsSubpages.put("advbwdist-data.html", + "WEB-INF/advbwdist-data.jsp"); + this.availableGraphsSubpages.put("clients-data.html", + "WEB-INF/clients-data.jsp"); + this.availableGraphsSubpages.put("torperf-data.html", + "WEB-INF/torperf-data.jsp"); + this.availableGraphsSubpages.put("connbidirect-data.html", + "WEB-INF/connbidirect-data.jsp"); this.availableGraphsSubpageTables = new HashMap<String, String>(); this.availableGraphsSubpageTables.put("userstats-relay-table.html", diff --git a/website/web/WEB-INF/advbwdist-data.jsp b/website/web/WEB-INF/advbwdist-data.jsp new file mode 100644 index 0000000..e6c655c --- /dev/null +++ b/website/web/WEB-INF/advbwdist-data.jsp @@ -0,0 +1,56 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics: Advertised bandwidth distribution and n-th fastest relays</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> + <div class="center"> + <%@ include file="banner.jsp"%> + <div class="main-column"> + +<h3>Tor Metrics: Advertised bandwidth distribution and n-th fastest +relays</h3> +<br> +<p>The following data file contains statistics on the distribution of +<a href="about.html#advertised-bandwidth">advertised bandwidth</a> of +relays in the network. +These statistics include advertised bandwidth percentiles and advertised +bandwidth values of the n-th fastest relays. +All values are obtained from advertised bandwidths of running relays in a +<a href="about.html#consensus">network status consensus</a>. +The data file contains daily (median) averages of percentiles and n-th +largest values.</p> + +<p><b>Download as <a href="stats/advbwdist.csv">CSV file</a>.</b></p> + +<p>The statistics file contains the following columns:</p> +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) when relays have been listed as +running.</li> +<li><b>isexit:</b> Whether relays included in this line have the +<b>"Exit"</b> relay flag, which would be indicated as <b>"t"</b>. +If this column contains the empty string, advertised bandwidths from all +running relays are included, regardless of assigned relay flags.</li> +<li><b>relay:</b> Position of the relay in an ordered list of all +advertised bandwidths, starting at 1 for the fastest relay in the network. +May be the empty string if this line contains advertised bandwidth by +percentile.</li> +<li><b>percentile:</b> Advertised bandwidth percentile given in this line. +May be the empty string if this line contains advertised bandwidth by +fastest relays.</li> +<li><b>advbw:</b> Advertised bandwidth in B/s.</li> +</ul> + + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html> + diff --git a/website/web/WEB-INF/bandwidth-data.jsp b/website/web/WEB-INF/bandwidth-data.jsp new file mode 100644 index 0000000..8bd2079 --- /dev/null +++ b/website/web/WEB-INF/bandwidth-data.jsp @@ -0,0 +1,68 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics: Bandwidth provided and consumed by relays</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> + <div class="center"> + <%@ include file="banner.jsp"%> + <div class="main-column"> + +<h3>Tor Metrics: Bandwidth provided and consumed by relays</h3> +<br> +<p>The following data file contains statistics on +<a href="about.html#advertised-bandwidth">advertised</a> and +<a href="about.html#bandwidth-history">consumed bandwidth</a> of +<a href="about.html#relay">relays</a> in the network. +Statistics on advertised bandwidth include any kind of traffic handled by +a relay, whereas statistics on consumed bandwidth are available either for +all traffic combined, or specifically for directory traffic. +Some of the statistics are available for subsets of relays that have the +"Exit" and/or the "Guard" <a href="about.html#relay-flag">flag</a>. +The data file contains daily (mean) averages of bandwidth numbers.</p> + +<p><b>Download as <a href="stats/bandwidth.csv">CSV file</a>.</b></p> + +<p>The statistics file contains the following columns:</p> +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) that relays reported bandwidth data +for.</li> +<li><b>isexit:</b> Whether relays included in this line have the +<b>"Exit"</b> relay flag or not, which can be <b>"t"</b> or <b>"f"</b>. +If this column contains the empty string, bandwidth data from all running +relays are included, regardless of assigned relay flags.</li> +<li><b>isguard:</b> Whether relays included in this line have the +<b>"Guard"</b> relay flag or not, which can be <b>"t"</b> or <b>"f"</b>. +If this column contains the empty string, bandwidth data from all running +relays are included, regardless of assigned relay flags.</li> +<li><b>advbw:</b> Total advertised bandwidth in bytes per second that +relays are capable to provide.</li> +<li><b>bwread:</b> Total bandwidth in bytes per second that relays have +read. +This metric includes any kind of traffic.</li> +<li><b>bwwrite:</b> Similar to <b>bwread</b>, but for traffic written by +relays.</li> +<li><b>dirread:</b> Bandwidth in bytes per second that relays have read +when serving directory data. +Not all relays report how many bytes they read when serving directory data +which is why this value is an estimate from the available data. +This metric is not available for subsets of relays with certain relay +flags, so that this column will contain the empty string if either +<b>isexit</b> or <b>isguard</b> is non-empty.</li> +<li><b>dirwrite:</b> Similar to <b>dirread</b>, but for traffic written by +relays when serving directory data.</li> +</ul> + + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html> + diff --git a/website/web/WEB-INF/bandwidth.jsp b/website/web/WEB-INF/bandwidth.jsp index 0e45a5f..d06d053 100644 --- a/website/web/WEB-INF/bandwidth.jsp +++ b/website/web/WEB-INF/bandwidth.jsp @@ -28,6 +28,8 @@ Sorry for any inconvenience caused by this.</p> <li><a href="dirbytes.html">Graph: Number of bytes spent on answering directory requests</a></li> <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> +<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li> +<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li> </ul> <br> <hr> diff --git a/website/web/WEB-INF/clients-data.jsp b/website/web/WEB-INF/clients-data.jsp new file mode 100644 index 0000000..f315b1a --- /dev/null +++ b/website/web/WEB-INF/clients-data.jsp @@ -0,0 +1,84 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics: Estimated number of clients in the Tor network</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> + <div class="center"> + <%@ include file="banner.jsp"%> + <div class="main-column"> + +<h3>Tor Metrics: Estimated number of clients in the Tor network</h3> +<br> +<p>The following data file contains estimates on the number of +<a href="about.html#client">clients</a> in the network. +These numbers are derived from directory requests counted on +<a href="about.html#directory-authority">directory authorities</a>, +<a href="about.html#directory-mirror">directory mirrors</a>, and +<a href="about.html#bridge">bridges</a>. +Statistics are available for clients connecting directly relays and +clients connecting via bridges. +There are statistics available by country (for both directly-connecting +clients and clients connecting via bridges), by transport protocol (only +for clients connecting via bridges), and by IP version (only for clients +connecting via bridges). +Statistics also include predicted client numbers from past observations, +which can be used to detect censorship events.</p> + +<p><b>Download as <a href="stats/clients.csv">CSV file</a>.</b></p> + +<p>The statistics file contains the following columns:</p> +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) for which client numbers are +estimated.</li> +<li><b>node:</b> The node type to which clients connect first, which can +be either <b>"relay"</b> or <b>"bridge"</b>.</li> +<li><b>country:</b> Two-letter lower-case country code as found in a GeoIP +database by resolving clients' IP addresses, or <b>"??"</b> if client IP +addresses could not be resolved. +If this column contains the empty string, all clients are included, +regardless of their country code.</li> +<li><b>transport:</b> Transport name used by clients to connect to the Tor +network using bridges. +Examples are <b>"obfs2"</b>, <b>"obfs3"</b>, <b>"websocket"</b>, or +<b>"<OR>"</b> (original onion routing protocol). +If this column contains the empty string, all clients are included, +regardless of their transport. +There are no statistics on the number of clients by transport that connect +to the Tor network via relays.</li> +<li><b>version:</b> IP version used by clients to connect to the Tor +network using bridges. +Examples are <b>"v4"</b> and <b>"v6"</b>. +If this column contains the empty string, all clients are included, +regardless of their IP version. +There are no statistics on the number of clients by IP version that connect +directly to the Tor network using relays.</li> +<li><b>lower:</b> Lower number of expected clients under the assumption +that there has been no censorship event. +If this column contains the empty string, there are no expectations on the +number of clients.</li> +<li><b>upper:</b> Upper number of expected clients under the assumption +that there has been no release of censorship. +If this column contains the empty string, there are no expectations on the +number of clients.</li> +<li><b>clients:</b> Estimated number of clients.</li> +<li><b>frac:</b> Fraction of relays or bridges in percent that the +estimate is based on. +The higher this value, the more reliable is the estimate. +Values above 50 can be considered reliable enough for most purposes, +lower values should be handled with more care.</li> +</ul> + + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html> + diff --git a/website/web/WEB-INF/connbidirect-data.jsp b/website/web/WEB-INF/connbidirect-data.jsp new file mode 100644 index 0000000..83fee07 --- /dev/null +++ b/website/web/WEB-INF/connbidirect-data.jsp @@ -0,0 +1,58 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics: Fraction of connections used uni-/bidirectionally</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> + <div class="center"> + <%@ include file="banner.jsp"%> + <div class="main-column"> + +<h3>Tor Metrics: Fraction of connections used uni-/bidirectionally</h3> +<br> +<p>The following data file contains statistics on the fraction of direct +connections between a <a href="about.html#relay">relay</a> and other nodes +in the network that are used uni- or bidirectionally. +Every 10 seconds, relays determine for every direct connection whether +they read and wrote less than a threshold of 20 KiB. +For the remaining connections, relays determine whether they read/wrote at +least 10 times as many bytes as they wrote/read. +If so, they classify a connection as "mostly reading" or "mostly writing", +respectively. +All other connections are classified as "both reading and writing". +After classifying connections, read and write counters are reset for the +next 10-second interval. +The data file contains the absolute number of 10-second intervals per +relay, aggregated over 24-hour periods.</p> + +<p><b>Download as <a href="stats/connbidirect.csv">CSV file</a>.</b></p> + +<p>The statistics file contains the following columns:</p> +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) for which statistics on +uni-/bidirectional connection usage were reported.</li> +<li><b>source:</b> Fingerprint of the relay reporting statistics.</li> +<li><b>below:</b> Number of 10-second intervals of connections with less +than 20 KiB read and written data.</li> +<li><b>read:</b> Number of 10-second intervals of connections with 10 +times as many read bytes as written bytes.</li> +<li><b>write:</b> Number of 10-second intervals of connections with 10 +times as many written bytes as read bytes.</li> +<li><b>both:</b> Number of 10-second intervals of connections with less +than 10 times as many written or read bytes as in the other +direction.</li> +</ul> + + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html> + diff --git a/website/web/WEB-INF/network.jsp b/website/web/WEB-INF/network.jsp index ec18beb..83216b0 100644 --- a/website/web/WEB-INF/network.jsp +++ b/website/web/WEB-INF/network.jsp @@ -27,6 +27,7 @@ Sorry for any inconvenience caused by this.</p> <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> diff --git a/website/web/WEB-INF/performance.jsp b/website/web/WEB-INF/performance.jsp index cc958b9..dd5d980 100644 --- a/website/web/WEB-INF/performance.jsp +++ b/website/web/WEB-INF/performance.jsp @@ -24,6 +24,8 @@ Sorry for any inconvenience caused by this.</p> <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> <li><a href="connbidirect.html">Graph: Fraction of connections used uni-/bidirectionally</a></li> +<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li> +<li><a href="connbidirect-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li> </ul> </div> diff --git a/website/web/WEB-INF/servers-data.jsp b/website/web/WEB-INF/servers-data.jsp new file mode 100644 index 0000000..307a77b --- /dev/null +++ b/website/web/WEB-INF/servers-data.jsp @@ -0,0 +1,90 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics: Number of relays and bridges</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> + <div class="center"> + <%@ include file="banner.jsp"%> + <div class="main-column"> + +<h3>Tor Metrics: Number of relays and bridges</h3> +<br> +<p>The following data file contains the number of running +<a href="about.html#relay">relays</a> and +<a href="about.html#bridge">bridges</a> in the network. +Statistics include subsets of relays or bridges by +<a href="about.html#relay-flag">relay flag</a> (relays only), country code +(relays only, and only until February 2013), tor software version (relays +only), operating system (relays only), and by whether or not they are +running in the EC2 cloud (bridges only). +The data file contains daily (mean) averages of relay and bridge +numbers.</p> + +<p><b>Download as <a href="stats/servers.csv">CSV file</a>.</b></p> + +<p>The statistics file contains the following columns:</p> +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) when relays or bridges have been +listed as running.</li> +<li><b>flag:</b> Relay flag assigned by the directory authorities. +Examples are <b>"Exit"</b>, <b>"Guard"</b>, <b>"Fast"</b>, +<b>"Stable"</b>, and <b>"HSDir"</b>. +Relays can have none, some, or all these relay flags assigned. +Relays that don't have the <b>"Running"</b> flag are not included in these +statistics regardless of their other flags. +If this column contains the empty string, all running relays are included, +regardless of assigned flags. +There are no statistics on the number of bridges by relay flag.</li> +<li><b>country:</b> Two-letter lower-case country code as found in a GeoIP +database by resolving the relay's first onion-routing IP address, or +<b>"??"</b> if an IP addresses could not be resolved. +If this column contains the empty string, all running relays are included, +regardless of their resolved country code. +Statistics on relays by country code are only available until January 31, +2013. +There are no statistics on the number of bridges by country code.</li> +<li><b>version:</b> First three dotted numbers of the Tor software version +as reported by the relay. +An example is <b>"0.2.5"</b>. +If this column contains the empty string, all running relays are included, +regardless of the Tor software version they run. +There are no statistics on the number of bridges by Tor software +version.</li> +<li><b>platform:</b> Operating system as reported by the relay. +Examples are <b>"Linux"</b>, <b>"Darwin"</b> (Mac OS X), <b>"FreeBSD"</b>, +<b>"Windows"</b>, and <b>"Other"</b>. +If this column contains the empty string, all running relays are included, +regardless of the operating system they run on. +There are no statistics on the number of bridges by operating system.</li> +<li><b>ec2bridge:</b> Whether bridges are running in the EC2 cloud or not. +More precisely, bridges in the EC2 cloud running an image provided by Tor +by default set their nickname to <b>"ec2bridger"</b> plus 8 random hex +characters. +This column either contains <b>"t"</b> for bridges matching this naming +scheme, or the empty string for all bridges regardless of their nickname. +There are no statistics on the number of relays running in the EC2 +cloud.</li> +<li><b>relays:</b> The average number of relays matching the criteria in +the previous columns. +If the values in previous columns are specific to bridges only, this +column contains the empty string.</li> +<li><b>bridges:</b> The average number of bridges matching the criteria in +the previous columns. +If the values in previous columns are specific to relays only, this column +contains the empty string.</li> +</ul> + + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html> + diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp index 005235e..21a0e07 100644 --- a/website/web/WEB-INF/stats.jsp +++ b/website/web/WEB-INF/stats.jsp @@ -12,292 +12,20 @@ <div class="main-column"> <h2>Tor Metrics: Statistics</h2> <br> - -<p><font color="red"><b>Notice:</b> The specification on this page has -moved -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/stats-spec.txt">here</a>. -This page will be removed after July 26, 2014.</font> -</p> - -<p>Tor Metrics aggregates large amounts of Tor network -<a href="data.html">data</a> and visualizes results in customizable -<a href="graphs.html">graphs</a> and tables. -All aggregated data are also available for download, so that people can -easily plot their own graphs or even develop a prettier metrics website -without writing their own data aggregation code. -Data formats of aggregate statistics are specified below.</p> -<hr> -<br> - -<a name="servers"></a> -<h3><a href="#servers" class="anchor">Number of relays and -bridges</a></h3> -<br> -<p>Statistics file <a href="stats/servers.csv">servers.csv</a> contains -the average number of relays and bridges in the Tor network. -All averages are calculated per day by evaluating the relay and bridge -lists published by the directory authorities. -Statistics include subsets of relays or bridges by relay flag (only -relays), country code (only relays, only until February 2013), Tor -software version (only relays), operating system (only relays), and EC2 -cloud (only bridges). -The statistics file contains the following columns:</p> - -<ul> -<li><b>date:</b> UTC date (YYYY-MM-DD) when relays or bridges have been -listed as running.</li> -<li><b>flag:</b> Relay flag assigned by the directory authorities. -Examples are <b>"Exit"</b>, <b>"Guard"</b>, <b>"Fast"</b>, -<b>"Stable"</b>, and <b>"HSDir"</b>. -Relays can have none, some, or all these relay flags assigned. -Relays that don't have the <b>"Running"</b> flag are not included in these -statistics regardless of their other flags. -If this column contains the empty string, all running relays are included, -regardless of assigned flags. -There are no statistics on the number of bridges by relay flag.</li> -<li><b>country:</b> Two-letter lower-case country code as found in a GeoIP -database by resolving the relay's first onion-routing IP address, or -<b>"??"</b> if an IP addresses could not be resolved. -If this column contains the empty string, all running relays are included, -regardless of their resolved country code. -Statistics on relays by country code are only available until January 31, -2013. -There are no statistics on the number of bridges by country code.</li> -<li><b>version:</b> First three dotted numbers of the Tor software version -as reported by the relay. -An example is <b>"0.2.5"</b>. -If this column contains the empty string, all running relays are included, -regardless of the Tor software version they run. -There are no statistics on the number of bridges by Tor software -version.</li> -<li><b>platform:</b> Operating system as reported by the relay. -Examples are <b>"Linux"</b>, <b>"Darwin"</b> (Mac OS X), <b>"FreeBSD"</b>, -<b>"Windows"</b>, and <b>"Other"</b>. -If this column contains the empty string, all running relays are included, -regardless of the operating system they run on. -There are no statistics on the number of bridges by operating system.</li> -<li><b>ec2bridge:</b> Whether bridges are running in the EC2 cloud or not. -More precisely, bridges in the EC2 cloud running an image provided by Tor -by default set their nickname to <b>"ec2bridger"</b> plus 8 random hex -characters. -This column either contains <b>"t"</b> for bridges matching this naming -scheme, or the empty string for all bridges regardless of their nickname. -There are no statistics on the number of relays running in the EC2 -cloud.</li> -<li><b>relays:</b> The average number of relays matching the criteria in -the previous columns. -If the values in previous columns are specific to bridges only, this -column contains the empty string.</li> -<li><b>bridges:</b> The average number of bridges matching the criteria in -the previous columns. -If the values in previous columns are specific to relays only, this column -contains the empty string.</li> -</ul> -<hr> -<br> - -<a name="bandwidth"></a> -<h3><a href="#bandwidth" class="anchor">Bandwidth provided and consumed by -relays</a></h3> -<br> -<p>Statistics on bandwidth provided and consumed by relays are contained -in file <a href="stats/bandwidth.csv">bandwidth.csv</a>. -This file contains three different bandwidth metrics: -(1) bandwidth that relays are capable to provide and bandwidth that relays -report to have consumed, either (2) for any traffic, or (3) only traffic -from serving directory data. -Relays providing bandwidth statistics are categorized by having the -<b>"Exit"</b> and <b>"Guard"</b> relay flag, having both, or not having -either. -The statistics file contains the following columns:</p> - -<ul> -<li><b>date:</b> UTC date (YYYY-MM-DD) that relays reported bandwidth data -for.</li> -<li><b>isexit:</b> Whether relays included in this line have the -<b>"Exit"</b> relay flag or not, which can be <b>"t"</b> or <b>"f"</b>. -If this column contains the empty string, bandwidth data from all running -relays are included, regardless of assigned relay flags.</li> -<li><b>isguard:</b> Whether relays included in this line have the -<b>"Guard"</b> relay flag or not, which can be <b>"t"</b> or <b>"f"</b>. -If this column contains the empty string, bandwidth data from all running -relays are included, regardless of assigned relay flags.</li> -<li><b>advbw:</b> Total advertised bandwidth in bytes per second that -relays are capable to provide.</li> -<li><b>bwread:</b> Total bandwidth in bytes per second that relays have -read. -This metric includes any kind of traffic.</li> -<li><b>bwwrite:</b> Similar to <b>bwread</b>, but for traffic written by -relays.</li> -<li><b>dirread:</b> Bandwidth in bytes per second that relays have read -when serving directory data. -Not all relays report how many bytes they read when serving directory data -which is why this value is an estimate from the available data. -This metric is not available for subsets of relays with certain relay -flags, so that this column will contain the empty string if either -<b>isexit</b> or <b>isguard</b> is non-empty.</li> -<li><b>dirwrite:</b> Similar to <b>dirread</b>, but for traffic written by -relays when serving directory data.</li> -</ul> -<hr> -<br> - -<a name="advbwdist"></a> -<h3><a href="#advbwdist" class="anchor">Advertised bandwidth distribution -and n-th fastest relays</a></h3> -<br> -<p>Statistics file <a href="stats/advbwdist.csv">advbwdist.csv</a> -contains statistics on the advertised bandwidth of relays in the network. -These statistics include advertised bandwidth percentiles and advertised -bandwidth values of the n-th fastest relays. -The statistics file contains the following columns:</p> +<p>The data file specifications on this page have moved to their own subpages. +This is part of an effort to make navigation on this website more intuitive. +In the future, this page will go away, and all data files can be searched more easily from the start page. +Sorry for any inconvenience caused by this.</p> <ul> -<li><b>date:</b> UTC date (YYYY-MM-DD) when relays have been listed as -running.</li> -<li><b>isexit:</b> Whether relays included in this line have the -<b>"Exit"</b> relay flag, which would be indicated as <b>"t"</b>. -If this column contains the empty string, advertised bandwidths from all -running relays are included, regardless of assigned relay flags.</li> -<li><b>relay:</b> Position of the relay in an ordered list of all -advertised bandwidths, starting at 1 for the fastest relay in the network. -May be the empty string if this line contains advertised bandwidth by -percentile.</li> -<li><b>percentile:</b> Advertised bandwidth percentile given in this line. -May be the empty string if this line contains advertised bandwidth by -fastest relays.</li> -<li><b>advbw:</b> Advertised bandwidth in B/s.</li> +<li><a href="servers-data.html">Data: Number of relays and bridges</a></li> +<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li> +<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li> +<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li> +<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li> +<li><a href="connbidirect-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li> </ul> -<hr> -<br> - -<a name="clients"></a> -<h3><a href="#clients" class="anchor">Estimated number of clients in the -Tor network</a></h3> -<br> -<p>Statistics file <a href="stats/clients.csv">clients.csv</a> contains -estimates on the number of clients in the Tor network. -These estimates are based on the number of directory requests counted on -directory mirrors and bridges. -Statistics are available for clients connecting directly to the Tor -network and clients connecting via bridges. -For relays, there exist statistics on the number of clients by country, -and for bridges, statistics are available by country, by transport, and by -IP version. -Statistics further include expected client numbers from past observations -which can be used to detect censorship or release of censorship. -The statistics file contains the following columns:</p> - -<ul> -<li><b>date:</b> UTC date (YYYY-MM-DD) for which client numbers are -estimated.</li> -<li><b>node:</b> The node type to which clients connect first, which can -be either <b>"relay"</b> or <b>"bridge"</b>.</li> -<li><b>country:</b> Two-letter lower-case country code as found in a GeoIP -database by resolving clients' IP addresses, or <b>"??"</b> if client IP -addresses could not be resolved. -If this column contains the empty string, all clients are included, -regardless of their country code.</li> -<li><b>transport:</b> Transport name used by clients to connect to the Tor -network using bridges. -Examples are <b>"obfs2"</b>, <b>"obfs3"</b>, <b>"websocket"</b>, or -<b>"<OR>"</b> (original onion routing protocol). -If this column contains the empty string, all clients are included, -regardless of their transport. -There are no statistics on the number of clients by transport that connect -to the Tor network via relays.</li> -<li><b>version:</b> IP version used by clients to connect to the Tor -network using bridges. -Examples are <b>"v4"</b> and <b>"v6"</b>. -If this column contains the empty string, all clients are included, -regardless of their IP version. -There are no statistics on the number of clients by IP version that connect -directly to the Tor network using relays.</li> -<li><b>lower:</b> Lower number of expected clients under the assumption -that there has been no censorship event. -If this column contains the empty string, there are no expectations on the -number of clients.</li> -<li><b>upper:</b> Upper number of expected clients under the assumption -that there has been no release of censorship. -If this column contains the empty string, there are no expectations on the -number of clients.</li> -<li><b>clients:</b> Estimated number of clients.</li> -<li><b>frac:</b> Fraction of relays or bridges in percent that the -estimate is based on. -The higher this value, the more reliable is the estimate. -Values above 50 can be considered reliable enough for most purposes, -lower values should be handled with more care.</li> -</ul> -<hr> -<br> - -<a name="torperf"></a> -<h3><a href="#torperf" class="anchor">Performance of downloading static -files over Tor</a></h3> -<br> -<p>Statistics file <a href="stats/torperf.csv">torperf.csv</a> contains -aggregate statistics on download performance over time. -These statistics come from the Torperf service that periodically downloads -static files over Tor. -The statistics file contains the following columns:</p> -<ul> -<li><b>date:</b> UTC date (YYYY-MM-DD) when download performance was -measured.</li> -<li><b>size:</b> Size of the downloaded file in bytes.</li> -<li><b>source:</b> Name of the Torperf service performing measurements. -If this column contains the empty string, all measurements are included, -regardless of which Torperf service performed them. -Examples are <b>"moria"</b>, <b>"siv"</b>, and <b>"torperf"</b>.</li> -<li><b>q1:</b> First quartile of time until receiving the last byte in -milliseconds.</li> -<li><b>md:</b> Median of time until receiving the last byte in -milliseconds.</li> -<li><b>q3:</b> Third quartile of time until receiving the last byte in -milliseconds.</li> -<li><b>timeouts:</b> Number of timeouts that occurred when attempting to -download the static file over Tor.</li> -<li><b>failures:</b> Number of failures that occurred when attempting to -download the static file over Tor.</li> -<li><b>requests:</b> Total number of requests made to download the static -file over Tor.</li> -</ul> -<hr> -<br> - -<a name="connbidirect"></a> -<h3><a href="#connbidirect" class="anchor">Fraction of connections used -uni-/bidirectionally</a></h3> -<br> -<p>Statistics file <a href="stats/connbidirect.csv">connbidirect.csv</a> -contains statistics on the fraction of connections that is used uni- or -bidirectionally. -Every 10 seconds, relays determine for every connection whether they read -and wrote less than a threshold of 20 KiB. -For the remaining connections, relays report whether they read/wrote at -least 10 times as many bytes as they wrote/read. -If so, they classify a connection as "mostly reading" or "mostly writing," -respectively. -All other connections are classified as "both reading and writing." -After classifying connections, read and write counters are reset for the -next 10-second interval. -Statistics are aggregated over 24 hours. -The statistics file contains the following columns:</p> - -<ul> -<li><b>date:</b> UTC date (YYYY-MM-DD) for which statistics on -uni-/bidirectional connection usage were reported.</li> -<li><b>source:</b> Fingerprint of the relay reporting statistics.</li> -<li><b>below:</b> Number of 10-second intervals of connections with less -than 20 KiB read and written data.</li> -<li><b>read:</b> Number of 10-second intervals of connections with 10 -times as many read bytes as written bytes.</li> -<li><b>write:</b> Number of 10-second intervals of connections with 10 -times as many written bytes as read bytes.</li> -<li><b>both:</b> Number of 10-second intervals of connections with less -than 10 times as many written or read bytes as in the other -direction.</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 new file mode 100644 index 0000000..6b78270 --- /dev/null +++ b/website/web/WEB-INF/torperf-data.jsp @@ -0,0 +1,59 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics: Performance of downloading static files over Tor</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> + <div class="center"> + <%@ include file="banner.jsp"%> + <div class="main-column"> + +<h3>Tor Metrics: Performance of downloading static files over Tor</h3> +<br> +<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> 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.</p> + +<p><b>Download as <a href="stats/torperf.csv">CSV file</a>.</b></p> + +<p>The statistics file contains the following columns:</p> +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) when download performance was +measured.</li> +<li><b>size:</b> Size of the downloaded file in bytes.</li> +<li><b>source:</b> Name of the Torperf service performing measurements. +If this column contains the empty string, all measurements are included, +regardless of which Torperf service performed them. +Examples are <b>"moria"</b>, <b>"siv"</b>, and <b>"torperf"</b>.</li> +<li><b>q1:</b> First quartile of time until receiving the last byte in +milliseconds.</li> +<li><b>md:</b> Median of time until receiving the last byte in +milliseconds.</li> +<li><b>q3:</b> Third quartile of time until receiving the last byte in +milliseconds.</li> +<li><b>timeouts:</b> Number of timeouts that occurred when attempting to +download the static file over Tor.</li> +<li><b>failures:</b> Number of failures that occurred when attempting to +download the static file over Tor.</li> +<li><b>requests:</b> Total number of requests made to download the static +file over Tor.</li> +</ul> + + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html> + diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp index 79ffd9d..015eea9 100644 --- a/website/web/WEB-INF/users.jsp +++ b/website/web/WEB-INF/users.jsp @@ -31,6 +31,7 @@ Sorry for any inconvenience caused by this.</p> <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> +<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li> </ul> </div>

1 0

[metrics-web/master] Update broken table links.
by karsten＠torproject.org 25 Nov '14

25 Nov '14

commit 20ead523f04b66ccddab0b48a0190e13cf633a6b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 25 11:42:33 2014 +0100 Update broken table links. --- website/web/WEB-INF/userstats-bridge-table.jsp | 2 +- website/web/WEB-INF/userstats-censorship-events.jsp | 2 +- website/web/WEB-INF/userstats-relay-table.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/web/WEB-INF/userstats-bridge-table.jsp b/website/web/WEB-INF/userstats-bridge-table.jsp index cc2f4c0..b32369f 100644 --- a/website/web/WEB-INF/userstats-bridge-table.jsp +++ b/website/web/WEB-INF/userstats-bridge-table.jsp @@ -45,7 +45,7 @@ country codes, so that numbers are available for most countries.</p> </tr> <c:forEach var="row" items="${userstats_bridge_tabledata}"> <tr> - <td><a href="users.html?graph=userstats-bridge-country&country=${row['cc']}#userstats-bridge-country">${row['country']}</a>&emsp;</td> + <td><a href="userstats-bridge-country.html?graph=userstats-bridge-country&country=${row['cc']}">${row['country']}</a>&emsp;</td> <td>${row['abs']} <c:if test="${row['rel'] != 'NA'}"> (<fmt:formatNumber type="number" minFractionDigits="2" value="${row['rel']}" /> %)</c:if></td> </tr> </c:forEach> diff --git a/website/web/WEB-INF/userstats-censorship-events.jsp b/website/web/WEB-INF/userstats-censorship-events.jsp index 69c071b..bc5552f 100644 --- a/website/web/WEB-INF/userstats-censorship-events.jsp +++ b/website/web/WEB-INF/userstats-censorship-events.jsp @@ -44,7 +44,7 @@ more details, see this </tr> <c:forEach var="row" items="${userstats_censorship_events_tabledata}"> <tr> - <td><a href="users.html?graph=userstats-relay-country&country=${row['cc']}&events=on#userstats-relay-country">${row['country']}</a>&emsp;</td> + <td><a href="userstats-relay-country.html?graph=userstats-relay-country&country=${row['cc']}&events=on">${row['country']}</a>&emsp;</td> <td>${row['downturns']}</td> <td>${row['upturns']}</td> </tr> diff --git a/website/web/WEB-INF/userstats-relay-table.jsp b/website/web/WEB-INF/userstats-relay-table.jsp index a519df3..c84b2d2 100644 --- a/website/web/WEB-INF/userstats-relay-table.jsp +++ b/website/web/WEB-INF/userstats-relay-table.jsp @@ -46,7 +46,7 @@ available for most countries.</p> </tr> <c:forEach var="row" items="${userstats_relay_tabledata}"> <tr> - <td><a href="users.html?graph=userstats-relay-country&country=${row['cc']}#userstats-relay-country">${row['country']}</a>&emsp;</td> + <td><a href="userstats-relay-country.html?graph=userstats-relay-country&country=${row['cc']}">${row['country']}</a>&emsp;</td> <td>${row['abs']} <c:if test="${row['rel'] != 'NA'}"> (<fmt:formatNumber type="number" minFractionDigits="2" value="${row['rel']}" /> %)</c:if></td> </tr> </c:forEach>

1 0

[metrics-web/master] Update graph descriptions and glossary.
by karsten＠torproject.org 25 Nov '14

25 Nov '14

commit 26072a93f3e62ac608a58708181783d509e2a46c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 25 11:28:45 2014 +0100 Update graph descriptions and glossary. Thanks, Harmony, for the careful review! --- website/web/WEB-INF/about.jsp | 97 ++++++++++++++++++++ website/web/WEB-INF/advbwdist-perc.jsp | 12 ++- website/web/WEB-INF/advbwdist-relay.jsp | 5 +- website/web/WEB-INF/bandwidth-flags.jsp | 12 ++- website/web/WEB-INF/bandwidth.jsp | 8 +- website/web/WEB-INF/bubbles.jsp | 16 ++++ website/web/WEB-INF/bwhist-flags.jsp | 6 +- website/web/WEB-INF/cloudbridges.jsp | 9 +- website/web/WEB-INF/connbidirect.jsp | 25 +++-- website/web/WEB-INF/dirbytes.jsp | 13 ++- website/web/WEB-INF/networksize.jsp | 5 +- website/web/WEB-INF/oxford-anonymous-internet.jsp | 13 +-- website/web/WEB-INF/platforms.jsp | 7 +- website/web/WEB-INF/relayflags.jsp | 12 ++- website/web/WEB-INF/torperf-failures.jsp | 11 ++- website/web/WEB-INF/torperf.jsp | 11 +-- website/web/WEB-INF/userstats-bridge-country.jsp | 6 ++ website/web/WEB-INF/userstats-bridge-table.jsp | 6 ++ website/web/WEB-INF/userstats-bridge-transport.jsp | 7 ++ website/web/WEB-INF/userstats-bridge-version.jsp | 6 ++ .../web/WEB-INF/userstats-censorship-events.jsp | 7 +- website/web/WEB-INF/userstats-relay-country.jsp | 12 +++ website/web/WEB-INF/userstats-relay-table.jsp | 7 ++ website/web/WEB-INF/versions.jsp | 16 ++-- 24 files changed, 261 insertions(+), 68 deletions(-) diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp index 1b66fd1..57d0155 100644 --- a/website/web/WEB-INF/about.jsp +++ b/website/web/WEB-INF/about.jsp @@ -13,6 +13,103 @@ <h2>Tor Metrics: About</h2> <br> +<h3>Frequently used terms</h3> +<br> + +<a name="advertised-bandwidth"></a> +<p><b><a href="#advertised-bandwidth">advertised bandwidth:</a></b> the +volume of traffic, both incoming and outgoing, that a +<a href="#relay">relay</a> is willing to sustain, as configured by the +operator and claimed to be observed from recent data transfers.</p> + +<a name="bandwidth-history"></a> +<p><b><a href="#bandwidth-history">bandwidth history:</a></b> the volume +of incoming and/or outgoing traffic that a <a href="#relay">relay</a> +claims to have handled on behalf of <a href="#client">clients</a>.</p> + +<a name="bridge"></a> +<p><b><a href="#bridge">bridge:</a></b> a <a href="#relay">relay</a> whose +existence is non-public and which can therefore provide access for blocked +<a href="#client">clients</a>, often in combination with +<a href="#pluggable-transport">pluggable transports</a>, which registers +itself with the <a href="#bridge-authority">bridge authority</a>.</p> + +<a name="bridge-authority"></a> +<p><b><a href="#bridge-authority">bridge 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 name="circuit"></a> +<p><b><a href="#circuit">circuit:</a></b> a path through the Tor network +built by <a href="#client">clients</a> consisting of at most one +<a href="#bridge">bridge</a> and at least one +<a href="#relay">relay</a>.</p> + +<a name="client"></a> +<p><b><a href="#client">client:</a></b> a node in the Tor network, +typically running on behalf of one user, that routes application +connections over a series of <a href="#relay">relays</a>.</p> + +<a name="consensus"></a> +<p><b><a href="#consensus">consensus:</a></b> a single document compiled +and voted on by the <a href="#directory-authority">directory +authorities</a> once per hour, ensuring that all +<a href="#client">clients</a> have the same information about the +<a href="#relay">relays</a> that make up the Tor network.</p> + +<a name="consensus-weight"></a> +<p><b><a href="#consensus-weight">consensus weight:</a></b> a value +assigned to a <a href="#relay">relay</a> that is based on bandwidth +observed by the relay and bandwidth measured by the +<a href="#directory-authority">directory authorities</a>, included in the +hourly published <a href="#consensus">consensus</a>, and used by +<a href="#client">clients</a> to select relays for their +<a href="#circuit">circuits</a>.</p> + +<a name="directory-authority"></a> +<p><b><a href="#directory-authority">directory authority:</a></b> a +special-purpose <a href="#relay">relay</a> that maintains a list of +currently-running relays and periodically publishes a +<a href="#consensus">consensus</a> together with the other directory +authorities.</p> + +<a name="directory-mirror"></a> +<p><b><a href="#directory-mirror">directory mirror:</a></b> a +<a href="#relay">relay</a> that provides a recent copy of directory +information to clients, in order to reduce the load on +<a href="#directory-authority">directory authorities</a>.</p> + +<a name="hidden-service"></a> +<p><b><a href="#hidden-service">hidden service:</a></b> a location-hidden +service (for example, a website or instant-messaging server) that is only +accessible via the Tor network.</p> + +<a name="pluggable-transport"></a> +<p><b><a href="#pluggable-transport">pluggable transport:</a></b> an +alternative transport protocol provided by <a href="#bridge">bridges</a> +and used by <a href="#client">clients</a> to circumvent transport-level +blockings (for example, by ISPs or governments).</p> + +<a name="relay"></a> +<p><b><a href="#relay">relay:</a></b> a publicly-listed node in the Tor +network that forwards traffic on behalf of <a href="#client">clients</a>, +and that registers itself with the +<a href="#directory-authority">directory authorities</a>.</p> + +<a name="relay-flag"></a> +<p><b><a href="#relay-flag">relay flag:</a></b> a special +(dis-)qualification of <a href="#relay">relays</a> for circuit positions +(for example, "Guard", "Exit", "BadExit"), circuit properties (for +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/blob/HEAD:/dir-spec.txt">directory +protocol specification</a>.</p> + +<h3>Frequently asked questions</h3> +<br> + <div style="line-height: 18pt;"> <p> <b>Q: How do you obtain all these facts in an anonymity network without diff --git a/website/web/WEB-INF/advbwdist-perc.jsp b/website/web/WEB-INF/advbwdist-perc.jsp index aa015bd..73f86d4 100644 --- a/website/web/WEB-INF/advbwdist-perc.jsp +++ b/website/web/WEB-INF/advbwdist-perc.jsp @@ -16,9 +16,15 @@ <h3>Tor Metrics: Advertised bandwidth distribution</h3> <br> -<p>The following graph shows the distribution of advertised bandwidth in -the network. In contrast to the graphs above, the following graph contains -no sums of advertised bandwidths, but bandwidths of single relays.</p> +<p>The following graph shows the distribution of the +<a href="about.html#advertised-bandwidth">advertised bandwidth</a> of +relays in the network. +Each percentile represents the advertised bandwidth that a given +percentage of relays does not exceed (and that in turn the remaining +relays either match or exceed). +For example, 99% of relays advertise at most the bandwidth value shown in +the 99th percentile line (and the remaining 1% advertise at least that +amount).</p> <img src="advbwdist-perc.png${advbwdist_perc_url}" width="576" height="360" alt="Advertised bandwidth distribution graph"> diff --git a/website/web/WEB-INF/advbwdist-relay.jsp b/website/web/WEB-INF/advbwdist-relay.jsp index afd45a5..190e74f 100644 --- a/website/web/WEB-INF/advbwdist-relay.jsp +++ b/website/web/WEB-INF/advbwdist-relay.jsp @@ -16,8 +16,9 @@ <h3>Tor Metrics: Advertised bandwidth of n-th fastest relays</h3> <br> -<p>The following graph shows the advertised bandwidth of the n-th fastest -relays in the network.</p> +<p>The following graph shows the +<a href="about.html#advertised-bandwidth">advertised bandwidth</a> of the +n-th fastest relays in the network for different values of n.</p> <img src="advbwdist-relay.png${advbwdist_relay_url}" width="576" height="360" alt="Advertised bandwidth of n-th fastest relays graph"> diff --git a/website/web/WEB-INF/bandwidth-flags.jsp b/website/web/WEB-INF/bandwidth-flags.jsp index a8de13e..7934fa4 100644 --- a/website/web/WEB-INF/bandwidth-flags.jsp +++ b/website/web/WEB-INF/bandwidth-flags.jsp @@ -16,11 +16,13 @@ <h3>Tor Metrics: Advertised bandwidth and bandwidth history by relay flags</h3> <br> -<p>The following graph shows the advertised bandwidth and bandwidth -history of all relays with the Exit and/or Guard flags assigned by the -directory authorities. -Note that these sets possibly overlap with relays having both Exit and -Guard flag.</p> +<p>The following graph shows +<a href="about.html#advertised-bandwidth">advertised</a> and +<a href="about.html#bandwidth-history">consumed bandwidth</a> of relays +with either "Exit" or "Guard" <a href="about.html#relay-flag">flags</a> +assigned by the directory authorities. +These sets are not distinct, because a relay that has both the "Exit" and +"Guard" flags assigned will be included in both sets.</p> <img src="bandwidth-flags.png${bandwidth_flags_url}" width="576" height="360" alt="Advertised bandwidth and bandwidth history by relay flags graph"> <form action="bandwidth-flags.html"> diff --git a/website/web/WEB-INF/bandwidth.jsp b/website/web/WEB-INF/bandwidth.jsp index cc3aa6b..0e45a5f 100644 --- a/website/web/WEB-INF/bandwidth.jsp +++ b/website/web/WEB-INF/bandwidth.jsp @@ -35,10 +35,10 @@ Sorry for any inconvenience caused by this.</p> <h3>Tor Metrics: Total relay bandwidth in the network</h3> <br> -<p>Relays report how much bandwidth they are willing to contribute and how -many bytes they have read and written in the past 24 hours. The following -graph shows total advertised bandwidth and bandwidth history of all relays -in the network.</p> +<p>The following graph shows the total +<a href="about.html#advertised-bandwidth">advertised</a> and +<a href="about.html#bandwidth-history">consumed bandwidth</a> of all +<a href="about.html#relay">relays</a> in the network.</p> <img src="bandwidth.png${bandwidth_url}" width="576" height="360" alt="Relay bandwidth graph"> <form action="bandwidth.html"> diff --git a/website/web/WEB-INF/bubbles.jsp b/website/web/WEB-INF/bubbles.jsp index 5c011c1..118d23f 100644 --- a/website/web/WEB-INF/bubbles.jsp +++ b/website/web/WEB-INF/bubbles.jsp @@ -30,6 +30,22 @@ Sorry for any inconvenience caused by this.</p> <h3>Tor Metrics: Network bubble graphs</h3> <br> +<p>The following graph visualizes diversity of currently running +<a href="about.html#relay">relays</a> in terms of their probability to be +selected for <a href="about.html#circuit">circuits</a>. +Fast relays with at least 100 Mbit/s bandwidth capacity, and which +therefore have a high probability of being selected for circuits, are +represented by an onion; smaller relays are shown as a simple dot; and the +slowest relays, which are almost never selected for circuits, are omitted +entirely. +Graphs in the "all relays" category use a relay's +<a href="about.html#consensus-weight">consensus weight</a> as probability, +whereas graphs in the "exits only" category use a value derived from a +relay's consensus weight that resembles the probability of selecting that +relay as exit node. +All graphs support grouping relays by same autonomous system, contact +information, country, or network family.</p> + <p> All relays: <a href="#no-group" onclick="make_bubble_graph('no-group');">No group</a> | diff --git a/website/web/WEB-INF/bwhist-flags.jsp b/website/web/WEB-INF/bwhist-flags.jsp index 3e1396a..941bd1b 100644 --- a/website/web/WEB-INF/bwhist-flags.jsp +++ b/website/web/WEB-INF/bwhist-flags.jsp @@ -16,8 +16,10 @@ <h3>Tor Metrics: Relay bandwidth by Exit and/or Guard flags</h3> <br> -<p>The following graph shows the relay bandwidth of all relays with the -Exit and/or Guard flags assigned by the directory authorities.</p> +<p>The following graph shows the +<a href="about.html#bandwidth-history">consumed bandwidth</a> reported by +relays, subdivided into four distinct subsets by assigned "Exit" and/or +"Guard" <a href="about.html#relay-flag">flags</a>.</p> <img src="bwhist-flags.png${bwhist_flags_url}" width="576" height="360" alt="Relay bandwidth by flags graph"> <form action="bwhist-flags.html"> diff --git a/website/web/WEB-INF/cloudbridges.jsp b/website/web/WEB-INF/cloudbridges.jsp index 2907bfe..b17fd27 100644 --- a/website/web/WEB-INF/cloudbridges.jsp +++ b/website/web/WEB-INF/cloudbridges.jsp @@ -17,9 +17,12 @@ <a name="cloudbridges"></a> <h3>Tor Metrics: Tor Cloud bridges</h3> <br> -<p>The following graph shows the average daily number of -<a href="http://cloud.torproject.org/">Tor Cloud</a> bridges in the -network.</p> +<p>The following graph shows the number of running +<a href="about.html#bridge">bridges</a> that are deployed in +<a href="http://aws.amazon.com/ec2/">Amazon's EC2 cloud</a> using images +provided by <a href="https://cloud.torproject.org/">Tor Cloud</a>. +These bridges have, by default, a nickname that starts with "ec2bridger" +which bridge operators usually leave unchanged.</p> <img src="cloudbridges.png${cloudbridges_url}" width="576" height="360" alt="Tor Cloud bridges graph"> <form action="cloudbridges.html"> diff --git a/website/web/WEB-INF/connbidirect.jsp b/website/web/WEB-INF/connbidirect.jsp index 46d91fd..c305745 100644 --- a/website/web/WEB-INF/connbidirect.jsp +++ b/website/web/WEB-INF/connbidirect.jsp @@ -15,16 +15,21 @@ <h3>Tor Metrics: Fraction of connections used uni-/bidirectionally</h3> <br> -<p>The following graph shows the fraction of connections that is used -uni- or bi-directionally. Every 10 seconds, relays determine for every -connection whether they read and wrote less than a threshold of 20 KiB. -Connections below this threshold are excluded from these statistics. For -the remaining connections, relays report whether they read/wrote at least -10 times as many bytes as they wrote/read. If so, they classify a -connection as "Mostly reading" or "Mostly writing," respectively. All -other connections are classified as "Both reading and writing." After -classifying connections, read and write counters are reset for the next -10-second interval. Statistics are aggregated over 24 hours.</p> +<p>The following graph shows the fraction of direct connections between a +<a href="about.html#relay">relay</a> and other nodes in the network that +are used uni- or bi-directionally. +Every 10 seconds, relays determine for every direct connection whether +they read and wrote less than a threshold of 20 KiB. +Connections below this threshold are excluded from the graph. +For the remaining connections, relays determine whether they read/wrote at +least 10 times as many bytes as they wrote/read. +If so, they classify a connection as "Mostly reading" or "Mostly writing", +respectively. +All other connections are classified as "Both reading and writing". +After classifying connections, read and write counters are reset for the +next 10-second interval. +The graph shows daily medians and inter-quartile ranges of reported +fractions.</p> <img src="connbidirect.png${connbidirect_url}" width="576" height="360" alt="Fraction of direct connections used uni-/bidirectionally"> diff --git a/website/web/WEB-INF/dirbytes.jsp b/website/web/WEB-INF/dirbytes.jsp index 10ea40e..b9f1dfc 100644 --- a/website/web/WEB-INF/dirbytes.jsp +++ b/website/web/WEB-INF/dirbytes.jsp @@ -16,11 +16,14 @@ <h3>Tor Metrics: Number of bytes spent on answering directory requests</h3> <br> -<p>Relays running on 0.2.2.15-alpha or higher report the number of bytes -they spend on answering directory requests. The following graph shows -total written and read bytes as well as written and read dir bytes. The -dir bytes are extrapolated from those relays who report them to reflect -the number of written and read dir bytes by all relays.</p> +<p>The following graph shows the portion of +<a href="about.html#bandwidth-history">consumed bandwidth</a> that +<a href="about.html#directory-authority">directory authorities</a> and +<a href="about.html#directory-mirror">mirrors</a> have spent on answering +directory requests. +Not all directories report these statistics, so the graph shows an +estimation of total consumed bandwidth as it would be observed if all +directories reported these statistics.</p> <img src="dirbytes.png${dirbytes_url}" width="576" height="360" alt="Dir bytes graph"> <form action="dirbytes.html"> diff --git a/website/web/WEB-INF/networksize.jsp b/website/web/WEB-INF/networksize.jsp index fbdcc3a..62b4e48 100644 --- a/website/web/WEB-INF/networksize.jsp +++ b/website/web/WEB-INF/networksize.jsp @@ -16,8 +16,9 @@ <h3>Tor Metrics: Relays and bridges in the network</h3> <br> -<p>The following graph shows the average daily number of relays and -bridges in the network.</p> +<p>The following graph shows the number of running +<a href="about.html#relay">relays</a> and +<a href="about.html#bridge">bridges</a> in the network.</p> <img src="networksize.png${networksize_url}" width="576" height="360" alt="Network size graph"> <form action="networksize.html"> diff --git a/website/web/WEB-INF/oxford-anonymous-internet.jsp b/website/web/WEB-INF/oxford-anonymous-internet.jsp index 4eb361c..fd18a01 100644 --- a/website/web/WEB-INF/oxford-anonymous-internet.jsp +++ b/website/web/WEB-INF/oxford-anonymous-internet.jsp @@ -17,12 +17,13 @@ <h3>Tor Metrics: Tor users as percentage of larger Internet population</h3> <br> <p>The Oxford Internet Institute made a cartogram visualization of Tor -users as compared to the overall Internet population per country. -They used the average number of Tor users from August 2012 to August 2013 -and put it in relation to total Internet users per country. -Be sure to read up the -<a href="http://geography.oii.ox.ac.uk/?page=tor">details and their -conclusions</a>.</p> +users as compared to the overall Internet population. +They used the average number of Tor <a href="about.html#client">users</a> +per country from August 2012 to August 2013 and put it in relation to +total Internet users per country. +More details and conclusions can be found on the +<a href="http://geography.oii.ox.ac.uk/?page=tor">Information Geographies +website at the Oxford Internet Institute</a>.</p> <a href="http://geography.oii.ox.ac.uk/?page=tor"> <img src="images/oxford-anonymous-internet.png" diff --git a/website/web/WEB-INF/platforms.jsp b/website/web/WEB-INF/platforms.jsp index bac911f..b422a96 100644 --- a/website/web/WEB-INF/platforms.jsp +++ b/website/web/WEB-INF/platforms.jsp @@ -16,9 +16,10 @@ <h3>Tor Metrics: Relays by platform</a></h3> <br> -<p>Relays report the operating system they are running to the directory -authorities. The following graph shows the number of relays by -platform.</p> +<p>The following graph shows the number of running +<a href="about.html#relay">relays</a> by operating system. +Relays report their operating system when they announce themselves in the +network.</p> <img src="platforms.png${platforms_url}" width="576" height="360" alt="Relay platforms graph"> <form action="platforms.html"> diff --git a/website/web/WEB-INF/relayflags.jsp b/website/web/WEB-INF/relayflags.jsp index 2149b7c..98e31ab 100644 --- a/website/web/WEB-INF/relayflags.jsp +++ b/website/web/WEB-INF/relayflags.jsp @@ -16,9 +16,15 @@ <h3>Tor Metrics: Relays with Exit, Fast, Guard, Stable, and HSDir flags</h3> <br> -<p>The directory authorities assign certain flags to relays that clients -use for their path selection decisions. The following graph shows the -average number of relays with these flags assigned.</p> + +<p>The following graph shows the number of running +<a href="about.html#relay">relays</a> that have had certain +<a href="about.html#relay-flag">flags</a> assigned by the +<a href="about.html#directory-authority">directory authorities</a>. +These flags indicate that a relay should be preferred for either guard +("Guard") or exit positions ("Exit"), that a relay is suitable for +high-bandwidth ("Fast") or long-lived circuits ("Stable"), or that a relay +is considered a hidden service directory ("HSDir").</p> <img src="relayflags.png${relayflags_url}" width="576" height="360" alt="Relay flags graph"> <form action="relayflags.html"> diff --git a/website/web/WEB-INF/torperf-failures.jsp b/website/web/WEB-INF/torperf-failures.jsp index 7c90f17..bfd9f0a 100644 --- a/website/web/WEB-INF/torperf-failures.jsp +++ b/website/web/WEB-INF/torperf-failures.jsp @@ -15,12 +15,13 @@ <h3>Tor Metrics: Timeouts and failures of downloading files over Tor</h3> <br> -<p>The following graphs show the fraction of timeouts and failures of -downloading files over Tor as experienced by users. -A timeout occurs when a 50 KiB (1 MiB, 5 MiB) download does not complete -within 4:55 minutes (29:55 minutes, 59:55 minutes). +<p>The following graph shows the fraction of timeouts and failures when +downloading static files of different sizes over Tor. +A timeout occurs when a download does not complete within the scheduled +time, in which case it is aborted in order not to overlap with the next +scheduled download. A failure occurs when the download completes, but the response is smaller -than 50 KiB (1 MiB, 5 MiB).</p> +than expected.</p> <img src="torperf-failures.png${torperf_failures_url}" width="576" height="360" alt="Torperf failures graph"> <form action="torperf-failures.html"> diff --git a/website/web/WEB-INF/torperf.jsp b/website/web/WEB-INF/torperf.jsp index f9c717b..61002d4 100644 --- a/website/web/WEB-INF/torperf.jsp +++ b/website/web/WEB-INF/torperf.jsp @@ -15,12 +15,11 @@ <h3>Tor Metrics: Time to download files over Tor</h3> <br> -<p>The following graphs show the performance of the Tor network as -experienced by its users. The graphs contain the average (median) time to -request files of three different sizes over Tor as well as first and third -quartile of request times. Medians and quartiles are calculated multiple -times per day for completed days only, resulting in a delay of 1 to 1.5 -days before changes to network performance become visible in the +<p>The following graph shows overall performance when downloading static +files of different sizes over Tor. +The graph shows the range of measurements from first to third quartile, +and highlights the median. +The slowest and fastest quarter of measurements are omitted from the graph.</p> <img src="torperf.png${torperf_url}" width="576" height="360" alt="Torperf graph"> diff --git a/website/web/WEB-INF/userstats-bridge-country.jsp b/website/web/WEB-INF/userstats-bridge-country.jsp index ae64c3a..44aa32c 100644 --- a/website/web/WEB-INF/userstats-bridge-country.jsp +++ b/website/web/WEB-INF/userstats-bridge-country.jsp @@ -16,6 +16,12 @@ <h3>Tor Metrics: Bridge users by country</h3> <br> +<p>The following graph shows the estimated number of +<a href="about.html#client">clients</a> connecting via +<a href="about.html#bridge">bridges</a>. +These numbers are derived from directory requests counted on bridges. +Bridges resolve client IP addresses of incoming directory requests to +country codes, so that graphs are available for most countries.</p> <img src="userstats-bridge-country.png${userstats_bridge_country_url}" width="576" height="360" alt="Bridge users by country graph"> <form action="userstats-bridge-country.html"> diff --git a/website/web/WEB-INF/userstats-bridge-table.jsp b/website/web/WEB-INF/userstats-bridge-table.jsp index 4e61728..cc2f4c0 100644 --- a/website/web/WEB-INF/userstats-bridge-table.jsp +++ b/website/web/WEB-INF/userstats-bridge-table.jsp @@ -16,6 +16,12 @@ <h3>Tor Metrics: Top-10 countries by bridge users</h3> <br> +<p>The following table shows the top-10 countries by estimated number of +<a href="about.html#client">clients</a> connecting via +<a href="about.html#bridge">bridges</a>. +These numbers are derived from directory requests counted on bridges. +Bridges resolve client IP addresses of incoming directory requests to +country codes, so that numbers are available for most countries.</p> <form action="userstats-bridge-table.html"> <div class="formrow"> <input type="hidden" name="table" value="userstats-bridge"> diff --git a/website/web/WEB-INF/userstats-bridge-transport.jsp b/website/web/WEB-INF/userstats-bridge-transport.jsp index d2d8295..ed06992 100644 --- a/website/web/WEB-INF/userstats-bridge-transport.jsp +++ b/website/web/WEB-INF/userstats-bridge-transport.jsp @@ -16,6 +16,13 @@ <h3>Tor Metrics: Bridge users by transport</h3> <br> +<p>The following graph shows the estimated number of +<a href="about.html#client">clients</a> connecting via +<a href="about.html#bridge">bridges</a>. +These numbers are derived from directory requests counted on bridges. +Bridges distinguish connecting clients by transport protocol, which may +include <a href="about.html#pluggable-transport">pluggable transports</a>, +so that graphs are available for different transports.</p> <img src="userstats-bridge-transport.png${userstats_bridge_transport_url}" width="576" height="360" alt="Bridge users by transport graph"> <form action="userstats-bridge-transport.html"> diff --git a/website/web/WEB-INF/userstats-bridge-version.jsp b/website/web/WEB-INF/userstats-bridge-version.jsp index b69454d..2e69b20 100644 --- a/website/web/WEB-INF/userstats-bridge-version.jsp +++ b/website/web/WEB-INF/userstats-bridge-version.jsp @@ -16,6 +16,12 @@ <h3>Tor Metrics: Bridge users by IP version</h3> <br> +<p>The following graph shows the estimated number of +<a href="about.html#client">clients</a> connecting via +<a href="about.html#bridge">bridges</a>. +These numbers are derived from directory requests counted on bridges. +Bridges distinguish connecting clients by IP version, so that graphs are +available for both IP versions 4 and 6.</p> <img src="userstats-bridge-version.png${userstats_bridge_version_url}" width="576" height="360" alt="Bridge users by IP version graph"> <form action="userstats-bridge-version.html"> diff --git a/website/web/WEB-INF/userstats-censorship-events.jsp b/website/web/WEB-INF/userstats-censorship-events.jsp index 3c90214..69c071b 100644 --- a/website/web/WEB-INF/userstats-censorship-events.jsp +++ b/website/web/WEB-INF/userstats-censorship-events.jsp @@ -14,9 +14,12 @@ <%@ include file="banner.jsp"%> <div class="main-column"> -<h3>Tor Metrics: Top-10 countries by possible censorship events (<a -href="http://research.torproject.org/techreports/detector-2011-09-09.pdf">BETA</a>)</h3> +<h3>Tor Metrics: Top-10 countries by possible censorship events</h3> <br> +<p>The following table shows the top-10 countries by possible censorship +events, as obtained from an anomaly-based censorship-detection system (for +more details, see this +<a href="https://research.torproject.org/techreports/detector-2011-09-09.pdf">technical report</a>).</p> <form action="userstats-censorship-events.html"> <div class="formrow"> <input type="hidden" name="table" value="userstats-censorship-events"> diff --git a/website/web/WEB-INF/userstats-relay-country.jsp b/website/web/WEB-INF/userstats-relay-country.jsp index e010ea0..d7b3f8f 100644 --- a/website/web/WEB-INF/userstats-relay-country.jsp +++ b/website/web/WEB-INF/userstats-relay-country.jsp @@ -16,6 +16,18 @@ <h3>Tor Metrics: Direct users by country</h3> <br> +<p>The following graph shows the estimated number of directly-connecting +<a href="about.html#client">clients</a>; that is, it excludes clients +connecting via <a href="about.html#bridge">bridges</a>. +These estimates are derived from the number of directory requests counted +on <a href="about.html#directory-authority">directory authorities</a> and +<a href="about.html#directory-mirror">mirrors</a>. +Relays resolve client IP addresses to country codes, so that graphs are +available for most countries. +Furthermore, it is possible to display indications of censorship events as +obtained from an anomaly-based censorship-detection system (for more +details, see this +<a href="https://research.torproject.org/techreports/detector-2011-09-09.pdf">technical report</a>).</p> <img src="userstats-relay-country.png${userstats_relay_country_url}" width="576" height="360" alt="Direct users by country graph"> <form action="userstats-relay-country.html"> diff --git a/website/web/WEB-INF/userstats-relay-table.jsp b/website/web/WEB-INF/userstats-relay-table.jsp index 6e59cae..a519df3 100644 --- a/website/web/WEB-INF/userstats-relay-table.jsp +++ b/website/web/WEB-INF/userstats-relay-table.jsp @@ -16,6 +16,13 @@ <h3>Tor Metrics: Top-10 countries by directly connecting users</h3> <br> +<p>The following table shows the top-10 countries by estimated number of +directly-connecting <a href="about.html#client">clients</a>. +These numbers are derived from directory requests counted on +<a href="about.html#directory-authority">directory authorities</a> and +<a href="about.html#directory-mirror">mirrors</a>. +Relays resolve client IP addresses to country codes, so that numbers are +available for most countries.</p> <form action="userstats-relay-table.html"> <div class="formrow"> <input type="hidden" name="table" value="userstats-relay"> diff --git a/website/web/WEB-INF/versions.jsp b/website/web/WEB-INF/versions.jsp index 5e5490e..2ae5bba 100644 --- a/website/web/WEB-INF/versions.jsp +++ b/website/web/WEB-INF/versions.jsp @@ -16,13 +16,15 @@ <h3>Tor Metrics: Relays by version</h3> <br> -<p>Relays report the Tor version that they are running to the directory -authorities. See the -<a href="https://www.torproject.org/download/download.html.en">download -page</a> and -<a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">ChangeLog file</a> -to find out which Tor versions are stable and unstable. -The following graph shows the number of relays by version.</p> +<p>The following graph shows the number of running +<a href="about.html#relay">relays</a> by tor software version. +Relays report their tor software version when they announce themselves in +the network. +More details on when these versions were declared stable or unstable can +be found on the +<a href="https://www.torproject.org/download/download.html">download page</a> +and in the +<a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">changes file</a>.</p> <img src="versions.png${versions_url}" width="576" height="360" alt="Relay versions graph"> <form action="versions.html">

1 0

[stem/master] Controller documentation vanished from the website
by atagar＠torproject.org 24 Nov '14

24 Nov '14

commit 45fd74dddcd53b4b43b66aa682243066558dba80 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 24 13:04:34 2014 -0800 Controller documentation vanished from the website Our @with_defaults decorator broke Sphinx's automodule magic, causing the Controller's documentation to mostly vanish from our API docs. This includes two ingredients to fix... * Using functools.wrap() so our decorator doesn't hide the docstring. This got our documentation back but the signatures were still borked, reporting that everything was my_method(*args, *kwargs). * Explicitly define the method signatures. Trick courtesy of... https://stackoverflow.com/questions/3687046/python-sphinx-autodoc-and-decor… --- docs/change_log.rst | 2 ++ stem/control.py | 55 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 5a3ca34..30c01a1 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -101,6 +101,8 @@ among numerous other improvements and fixes. * The :func:`~stem.control.Controller.add_event_listener` method couldn't accept event types that Stem didn't already recognize * The :class:`~stem.exit_policy.ExitPolicy` class couldn't be pickled * Tor instances spawned with :func:`~stem.process.launch_tor` and :func:`~stem.process.launch_tor_with_config` could hang due to unread stdout content, we now close stdout and stderr once tor finishes bootstrapping (:trac:`9862`) + * The :func:`~stem.control.Controller.get_exit_policy` method errored if tor couldn't determine our external address + * The Controller's methods for retrieving descriptors could raise unexpected ValueErrors if tor didn't have any descriptors available * **Descriptors** diff --git a/stem/control.py b/stem/control.py index 1079629..431e360 100644 --- a/stem/control.py +++ b/stem/control.py @@ -221,6 +221,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo import calendar import collections +import functools import inspect import io import os @@ -365,18 +366,19 @@ def with_default(yields = False): def decorator(func): def get_default(func, args, kwargs): - arg_names = inspect.getargspec(func).args + arg_names = inspect.getargspec(func).args[1:] # drop 'self' default_position = arg_names.index('default') if 'default' in arg_names else None - if default_position and default_position < len(args): + if default_position is not None and default_position < len(args): return args[default_position] else: return kwargs.get('default', UNDEFINED) if not yields: - def wrapped(*args, **kwargs): + @functools.wraps(func) + def wrapped(self, *args, **kwargs): try: - return func(*args, **kwargs) + return func(self, *args, **kwargs) except Exception as exc: default = get_default(func, args, kwargs) @@ -385,9 +387,10 @@ def with_default(yields = False): else: return default else: - def wrapped(*args, **kwargs): + @functools.wraps(func) + def wrapped(self, *args, **kwargs): try: - for val in func(*args, **kwargs): + for val in func(self, *args, **kwargs): yield val except Exception as exc: default = get_default(func, args, kwargs) @@ -944,6 +947,8 @@ class Controller(BaseController): @with_default() def get_info(self, params, default = UNDEFINED, get_bytes = False): """ + get_info(params, default = UNDEFINED, get_bytes = False) + Queries the control socket for the given GETINFO option. If provided a default then that's returned if the GETINFO option is undefined or the call fails for any reason (error response, control port closed, initiated, @@ -1064,6 +1069,8 @@ class Controller(BaseController): @with_default() def get_version(self, default = UNDEFINED): """ + get_version(default = UNDEFINED) + A convenience method to get tor version that current controller is connected to. @@ -1090,6 +1097,8 @@ class Controller(BaseController): @with_default() def get_exit_policy(self, default = UNDEFINED): """ + get_exit_policy(default = UNDEFINED) + Effective ExitPolicy for our relay. This accounts for ExitPolicyRejectPrivate and default policies. @@ -1127,6 +1136,8 @@ class Controller(BaseController): @with_default() def get_ports(self, listener_type, default = UNDEFINED): """ + get_ports(listener_type, default = UNDEFINED) + Provides the local ports where tor is listening for the given type of connections. This is similar to :func:`~stem.control.Controller.get_listeners`, but doesn't provide @@ -1150,6 +1161,8 @@ class Controller(BaseController): @with_default() def get_listeners(self, listener_type, default = UNDEFINED): """ + get_listeners(listener_type, default = UNDEFINED) + Provides the addresses and ports where tor is listening for connections of the given type. This is similar to :func:`~stem.control.Controller.get_ports` but includes listener addresses @@ -1238,6 +1251,8 @@ class Controller(BaseController): @with_default() def get_accounting_stats(self, default = UNDEFINED): """ + get_accounting_stats(default = UNDEFINED) + Provides stats related to our relaying limitations if AccountingMax was set in our torrc. This provides a **namedtuple** with the following attributes... @@ -1311,6 +1326,8 @@ class Controller(BaseController): @with_default() def get_protocolinfo(self, default = UNDEFINED): """ + get_protocolinfo(default = UNDEFINED) + A convenience method to get the protocol info of the controller. :param object default: response if the query fails @@ -1332,6 +1349,8 @@ class Controller(BaseController): @with_default() def get_user(self, default = UNDEFINED): """ + get_user(default = UNDEFINED) + Provides the user tor is running as. This often only works if tor is running locally. Also, most of its checks are platform dependent, and hence are not entirely reliable. @@ -1363,6 +1382,8 @@ class Controller(BaseController): @with_default() def get_pid(self, default = UNDEFINED): """ + get_pid(default = UNDEFINED) + Provides the process id of tor. This often only works if tor is running locally. Also, most of its checks are platform dependent, and hence are not entirely reliable. @@ -1415,6 +1436,8 @@ class Controller(BaseController): @with_default() def get_microdescriptor(self, relay = None, default = UNDEFINED): """ + get_microdescriptor(relay = None, default = UNDEFINED) + Provides the microdescriptor for the relay with the given fingerprint or nickname. If the relay identifier could be either a fingerprint *or* nickname then it's queried as a fingerprint. @@ -1463,6 +1486,8 @@ class Controller(BaseController): @with_default(yields = True) def get_microdescriptors(self, default = UNDEFINED): """ + get_microdescriptors(default = UNDEFINED) + Provides an iterator for all of the microdescriptors that tor presently knows about. @@ -1505,6 +1530,8 @@ class Controller(BaseController): @with_default() def get_server_descriptor(self, relay = None, default = UNDEFINED): """ + get_server_descriptor(relay = None, default = UNDEFINED) + Provides the server descriptor for the relay with the given fingerprint or nickname. If the relay identifier could be either a fingerprint *or* nickname then it's queried as a fingerprint. @@ -1564,6 +1591,8 @@ class Controller(BaseController): @with_default(yields = True) def get_server_descriptors(self, default = UNDEFINED): """ + get_server_descriptors(default = UNDEFINED) + Provides an iterator for all of the server descriptors that tor presently knows about. @@ -1609,6 +1638,8 @@ class Controller(BaseController): @with_default() def get_network_status(self, relay = None, default = UNDEFINED): """ + get_network_status(relay = None, default = UNDEFINED) + Provides the router status entry for the relay with the given fingerprint or nickname. If the relay identifier could be either a fingerprint *or* nickname then it's queried as a fingerprint. @@ -1677,6 +1708,8 @@ class Controller(BaseController): @with_default(yields = True) def get_network_statuses(self, default = UNDEFINED): """ + get_network_statuses(default = UNDEFINED) + Provides an iterator for all of the router status entries that tor presently knows about. @@ -2033,6 +2066,8 @@ class Controller(BaseController): @with_default() def get_hidden_service_conf(self, default = UNDEFINED): """ + get_hidden_service_conf(default = UNDEFINED) + This provides a mapping of hidden service directories to their attribute's key/value pairs. All hidden services are assured to have a 'HiddenServicePort', but other entries may or may not exist. @@ -2501,6 +2536,8 @@ class Controller(BaseController): @with_default() def get_circuit(self, circuit_id, default = UNDEFINED): """ + get_circuit(circuit_id, default = UNDEFINED) + Provides a circuit presently available from tor. :param int circuit_id: circuit to be fetched @@ -2524,6 +2561,8 @@ class Controller(BaseController): @with_default() def get_circuits(self, default = UNDEFINED): """ + get_circuits(default = UNDEFINED) + Provides tor's currently available circuits. :param object default: response if the query fails @@ -2706,6 +2745,8 @@ class Controller(BaseController): @with_default() def get_streams(self, default = UNDEFINED): """ + get_streams(default = UNDEFINED) + Provides the list of streams tor is currently handling. :param object default: response if the query fails @@ -2843,6 +2884,8 @@ class Controller(BaseController): @with_default() def get_effective_rate(self, default = UNDEFINED, burst = False): """ + get_effective_rate(default = UNDEFINED, burst = False) + Provides the maximum rate this relay is configured to relay in bytes per second. This is based on multiple torrc parameters if they're set...

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 24 Nov '14

24 Nov '14

commit 560c6c80cd006128a31cd3c9bf53de7690387c34 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 24 20:45:22 2014 +0000 Update translations for liveusb-creator_completed --- es/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/es.po b/es/es.po index 5365004..726f393 100644 --- a/es/es.po +++ b/es/es.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2014-11-24 20:13+0000\n" +"PO-Revision-Date: 2014-11-24 20:21+0000\n" "Last-Translator: BL <tresemes3(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -482,7 +482,7 @@ msgstr "Desmontando los sistemas de ficheros montados sobre '%(device)s'" #: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "El dispositivo «%(device)s» no es compatible. Cree un informe de error." +msgstr "Dispositivo '%(device)s' no soportado, por favor reporte el fallo." #: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 24 Nov '14

24 Nov '14

commit 6f7f973eb0864743735bab28d0163e5c2756f935 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 24 20:45:18 2014 +0000 Update translations for liveusb-creator --- es/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/es.po b/es/es.po index 5365004..726f393 100644 --- a/es/es.po +++ b/es/es.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2014-11-24 20:13+0000\n" +"PO-Revision-Date: 2014-11-24 20:21+0000\n" "Last-Translator: BL <tresemes3(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -482,7 +482,7 @@ msgstr "Desmontando los sistemas de ficheros montados sobre '%(device)s'" #: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "El dispositivo «%(device)s» no es compatible. Cree un informe de error." +msgstr "Dispositivo '%(device)s' no soportado, por favor reporte el fallo." #: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format

1 0