[tor-commits] [metrics-web/master] Update graph descriptions and glossary.

karsten at torproject.org karsten at torproject.org
Tue Nov 25 13:51:38 UTC 2014


commit 26072a93f3e62ac608a58708181783d509e2a46c
Author: Karsten Loesing <karsten.loesing at 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">





More information about the tor-commits mailing list