commit 74f7e3d736815a0966fab482538315e2b8a6c740 Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Sep 11 15:00:11 2018 +0200
Fix a couple HTML issues. --- src/main/resources/web/jsps/reproducible-metrics.jsp | 4 ++-- src/main/resources/web/jsps/stats.jsp | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/web/jsps/reproducible-metrics.jsp b/src/main/resources/web/jsps/reproducible-metrics.jsp index 87f692e..8c72ffc 100644 --- a/src/main/resources/web/jsps/reproducible-metrics.jsp +++ b/src/main/resources/web/jsps/reproducible-metrics.jsp @@ -304,7 +304,7 @@ If the <code>"platform"</code> line contains neither of these substrings, memori If the platform line is missing, we skip this descriptor, which later leads to not counting this relay at all rather than including it in the "Other" group, which is slightly wrong.</li> <li>IPv6 announced OR: Parse any <code>"or-address"</code> lines and memorize whether at least one of them contains an IPv6 address. This indicates that the relay announced an IPv6 address.</li> <li>IPv6 exiting: Parse the <code>"ipv6-policy"</code> line, if present, and memorize whether it's different from "reject 1-65535". This indicates whether the relay permitted exiting to IPv6 targets. If the line is not present, memorize that the relay does not permit exiting to IPv6 targets.</li> -<li>Server descriptor digest: Compute the SHA-1 digest, or determine it from the file name in case of archived descriptor tarballs.</p> +<li>Server descriptor digest: Compute the SHA-1 digest, or determine it from the file name in case of archived descriptor tarballs.</li> </ul>
<h4>Step 3: Compute daily averages</h4> @@ -429,7 +429,7 @@ Refer to the <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.tx
<ul> <li>Advertised bandwidth: Parse the three values (or just two in very old descriptors) from the <code>"bandwidth"</code> line. These values stand for the average bandwidth, burst bandwidth, and observed bandwidth. The advertised bandwidth is the minimum of these values.</li> -<li>Server descriptor digest: Compute the SHA-1 digest, or determine it from the file name in case of archived descriptor tarballs.</p> +<li>Server descriptor digest: Compute the SHA-1 digest, or determine it from the file name in case of archived descriptor tarballs.</li> </ul>
<!-- Note: In the bandwidth and bandwidth-flags graph we calculate advertised bandwidth as minimum of first and third value and ignore the second. However, tor ensures in config.c that RelayBandwidthBurst is at least equal to RelayBandwidthRate. Hence, the result is the same. --> diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 565f235..52e0bb5 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -171,6 +171,8 @@ using bridges, which can be either <b>"v4"</b> or <b>"v6"</b>.</li> <li><b>frac:</b> Fraction of bridges in percent that the estimate is based on.</li> </ul>
+</div> + <div class="container"> <h2><i class="fa fa-server fa-fw" aria-hidden="true"></i> Servers <a href="#servers" name="servers" class="anchor">#</a></h2> @@ -393,6 +395,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <li><b>p:</b> Percentile as value between 0 and 100.</li> <li><b>all:</b> Advertised bandwidth in Gbit/s of the p-th percentile of all relays.</li> <li><b>exits:</b> Advertised bandwidth in Gbit/s of the p-th percentile of relays with the <b>"Exit"</b> relay flag.</li> +</ul>
<h3>Advertised bandwidth of n-th fastest relays <a href="/advbwdist-relay.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> @@ -696,7 +699,7 @@ Applications <a href="#applications" name="applications" class="anchor">#</a></h
<h4>Columns</h4>
-</ul> +<ul> <li><b>date:</b> UTC date (YYYY-MM-DD) when requests to <code>torproject.org</code> web servers have been logged.</li> <li><b>locale:</b> Locale, like "en-US" for English (United States), "de" for German, etc., and "??" for unrecognized locales.</li> <li><b>initial_downloads:</b> Number of Tor Browser initial downloads.</li> @@ -731,6 +734,8 @@ Applications <a href="#applications" name="applications" class="anchor">#</a></h These files will no longer be publicly available after September 15, 2018. All relevant contained data will still be available via the statistics files specified above.</p>
+</div> + <div class="container"> <h3>Number of relays and bridges (deprecated) <a href="#servers" name="servers" class="anchor">#</a></h3>