September 2018 - tor-commits - lists.torproject.org

[metrics-web/release] Use Map.putIfAbsent and Map.getOrDefault where possible.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 5e4ef944eccf18b5276647828162fa2bc76a2f8f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 15:12:01 2018 +0200 Use Map.putIfAbsent and Map.getOrDefault where possible. --- src/main/java/org/torproject/metrics/stats/connbidirect/Main.java | 7 ++----- .../java/org/torproject/metrics/stats/hidserv/Aggregator.java | 8 ++------ .../java/org/torproject/metrics/stats/hidserv/DocumentStore.java | 4 +--- .../java/org/torproject/metrics/stats/hidserv/… [View More]Extrapolator.java | 4 +--- .../metrics/stats/servers/ConsensusStatsFileHandler.java | 8 ++------ src/main/java/org/torproject/metrics/web/MetricServlet.java | 4 +--- 6 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java index a069d84..b2dc1b6 100644 --- a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java +++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java @@ -447,11 +447,8 @@ public class Main { rawStat.fractionWrite, rawStat.fractionBoth }; for (int i = 0; i < directions.length; i++) { String dateAndDirection = date + "," + directions[i]; - if (!fractionsByDateAndDirection.containsKey( - dateAndDirection)) { - fractionsByDateAndDirection.put(dateAndDirection, - new ArrayList<>()); - } + fractionsByDateAndDirection.putIfAbsent(dateAndDirection, + new ArrayList<>()); fractionsByDateAndDirection.get(dateAndDirection).add( fractions[i]); } diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java index 14fc31f..36e7967 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java @@ -88,17 +88,13 @@ public class Aggregator { continue; } if (extrapolated.getFractionRendRelayedCells() > 0.0) { - if (!extrapolatedCells.containsKey(date)) { - extrapolatedCells.put(date, new ArrayList<>()); - } + extrapolatedCells.putIfAbsent(date, new ArrayList<>()); extrapolatedCells.get(date).add(new double[] { extrapolated.getExtrapolatedRendRelayedCells(), extrapolated.getFractionRendRelayedCells() }); } if (extrapolated.getFractionDirOnionsSeen() > 0.0) { - if (!extrapolatedOnions.containsKey(date)) { - extrapolatedOnions.put(date, new ArrayList<>()); - } + extrapolatedOnions.putIfAbsent(date, new ArrayList<>()); extrapolatedOnions.get(date).add(new double[] { extrapolated.getExtrapolatedDirOnionsSeen(), extrapolated.getFractionDirOnionsSeen() }); diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java index f73812a..61b9fa8 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java @@ -58,9 +58,7 @@ public class DocumentStore<T extends Document> { SortedMap<String, SortedSet<String>> formattedDocuments = new TreeMap<>(); for (T retrieveDocument : retrievedDocuments) { String[] formattedDocument = retrieveDocument.format(); - if (!formattedDocuments.containsKey(formattedDocument[0])) { - formattedDocuments.put(formattedDocument[0], new TreeSet<>()); - } + formattedDocuments.putIfAbsent(formattedDocument[0], new TreeSet<>()); formattedDocuments.get(formattedDocument[0]).add( formattedDocument[1]); } diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java index 2c4a8f8..0dcc638 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java @@ -99,9 +99,7 @@ public class Extrapolator { new TreeMap<>(); for (ReportedHidServStats stat : reportedStats) { String fingerprint = stat.getFingerprint(); - if (!parsedStatsByFingerprint.containsKey(fingerprint)) { - parsedStatsByFingerprint.put(fingerprint, new HashSet<>()); - } + parsedStatsByFingerprint.putIfAbsent(fingerprint, new HashSet<>()); parsedStatsByFingerprint.get(fingerprint).add(stat); } diff --git a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java index f4f99cd..491170e 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java +++ b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java @@ -257,13 +257,9 @@ public class ConsensusStatsFileHandler { continue; } String date = bridgesRawLine.substring(0, 10); - if (!bridgesPerDayAndAuthority.containsKey(date)) { - bridgesPerDayAndAuthority.put(date, new TreeMap<>()); - } + bridgesPerDayAndAuthority.putIfAbsent(date, new TreeMap<>()); String authority = parts[1]; - if (!bridgesPerDayAndAuthority.get(date).containsKey(authority)) { - bridgesPerDayAndAuthority.get(date).put(authority, new int[3]); - } + bridgesPerDayAndAuthority.get(date).putIfAbsent(authority, new int[3]); int[] bridges = bridgesPerDayAndAuthority.get(date).get(authority); bridges[0] += brunning; bridges[1] += Integer.parseInt(parts[3]); diff --git a/src/main/java/org/torproject/metrics/web/MetricServlet.java b/src/main/java/org/torproject/metrics/web/MetricServlet.java index 3b279a9..353af63 100644 --- a/src/main/java/org/torproject/metrics/web/MetricServlet.java +++ b/src/main/java/org/torproject/metrics/web/MetricServlet.java @@ -44,9 +44,7 @@ public abstract class MetricServlet extends AnyServlet { String id = metric.getId(); String title = metric.getTitle(); String type = metric.getType(); - if (!this.idsByType.containsKey(type)) { - this.idsByType.put(type, new HashSet<>()); - } + this.idsByType.putIfAbsent(type, new HashSet<>()); this.idsByType.get(type).add(id); this.titles.put(id, title); this.descriptions.put(id, metric.getDescription()); [View Less]

1 0

[metrics-web/release] Update to latest metrics-lib.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 0f3d958166a14b4b71fecd801e45515f7a0c2aed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 31 16:12:04 2018 +0200 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index f6c7e0e..7c26323 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit f6c7e0e4d9c69f889206687f23ca7dadd23a4e99 +Subproject commit 7c26323811d733643f9042611c55cdaeec4e3cc4

1 0

[metrics-web/release] Update news.json to version 286 of doc/MetricsTimeline.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 12d2b69bef43d80ca0eb7c111b12d3f09db205d7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 5 11:54:45 2018 +0200 Update news.json to version 286 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 8e5b86a..9810770 100644 --- a/src/main/resources/web/json/news.json +++ b/… [View More]

1 0

[metrics-web/release] Document Onionoo version 7.0.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 59045f54485d16726e979ffa7d0c9a3a63e81788 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 5 12:12:19 2018 +0200 Document Onionoo version 7.0. --- src/main/resources/web/jsps/onionoo.jsp | 53 +++++++++++++++------------------ 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/src/main/resources/web/jsps/onionoo.jsp b/src/main/resources/web/jsps/onionoo.jsp index b6c7313..0448b6f 100644 --- a/src/main/resources/web/jsps/onionoo.jsp +++ b/src/… [View More]main/resources/web/jsps/onionoo.jsp @@ -322,12 +322,11 @@ an "as_name" parameter to search for relays by AS name, and added support for comma-separated lists in the "as" and the "lookup" parameters on August 3, 2018. <a href="#versions_6_2" class="anchor">#</a></li> <li><a id="versions_7_0"></a><strong>7.0</strong>: -(scheduled, but not deployed yet!): Extend the "version" parameter to support -lists and ranges, remove redundant "1_week" and "1_month" graphs from clients -documents, change "3_months" graphs to "6_months" graphs in all documents -containing history objects, remove the "fingerprint" parameter, and remove the -previously deprecated "as_number" field from details documents, to be deployed -after September 3, 2018. +Extended the "version" parameter to support lists and ranges, removed redundant +"1_week" and "1_month" graphs from clients documents, changed "3_months" graphs +to "6_months" graphs in all documents containing history objects, removed the +"fingerprint" parameter, and removed the previously deprecated "as_number" field +from details documents on September 10, 2018. <a href="#versions_7_0" class="anchor">#</a></li> </ul> @@ -485,7 +484,7 @@ Lookups are case-insensitive. <li> <a id="parameters_fingerprint"></a> -<b>fingerprint <span class="label label-warning">deprecated</span></b> +<b>fingerprint <span class="label label-warning">removed</span></b> <a href="#parameters_fingerprint" class="anchor">#</a> <p> Return only the relay with the parameter value matching the fingerprint @@ -497,7 +496,7 @@ with two exceptions: not</i> be hashed (again) using SHA-1; (2) the response will contain any matching relay or bridge regardless of whether they have been running in the past week. -<span class="red">Scheduled to be removed after September 3, 2018.</span> +<span class="red">Removed on September 10, 2018.</span> </p> </li> @@ -633,11 +632,6 @@ a family. <b>version <span class="label label-primary">updated</span></b> <a href="#parameters_version" class="anchor">#</a> <p> -Return only relays or bridges running a Tor version that starts with the -parameter value <i>without</i> leading <code>"Tor"</code>. -Searches are case-insensitive. -<span class="blue">Scheduled to support lists and ranges after September 3, -2018: Return only relays or bridges running either Tor version from a list or range given in the parameter value. Tor versions must be provided <i>without</i> the leading <code>"Tor"</code> @@ -645,7 +639,9 @@ part. Multiple versions can either be provided as a comma-separated list (","), as a range separated by two dots (".."), or as a list of ranges. Provided versions are parsed and matched by parsed dotted numbers, rather than -by string prefix.</span> +by string prefix. +<span class="blue">Extended to support lists and ranges on September 10, +2018.</span> </p> </li> @@ -1332,7 +1328,7 @@ database. <li> <a id="details_relay_as_number"></a> -<b>as_number</b> <span class="label label-warning">deprecated</span> +<b>as_number</b> <span class="label label-warning">removed</span> <code class="typeof">string</code> <span class="required-false">optional</span> <a href="#details_relay_as_number" class="anchor">#</a> @@ -1342,7 +1338,7 @@ resolving the relay's first onion-routing IP address. AS number strings start with "AS", followed directly by the AS number. Omitted if the relay IP address could not be found in the AS database. -<span class="red">Scheduled to be removed after September 3, 2018.</span> +<span class="red">Removed on September 10, 2018.</span> </p> </li> @@ -2166,7 +2162,7 @@ Keys are string representation of the time period covered by the graph history object. Keys are fixed strings <strong>"3_days"</strong>, <strong>"1_week"</strong>, <strong>"1_month"</strong>, -<strong>"3_months"</strong>, <strong>"1_year"</strong>, and +<strong>"6_months"</strong>, <strong>"1_year"</strong>, and <strong>"5_years"</strong>. Keys refer to the last known bandwidth history of a relay, not to the time when the bandwidth document was published. @@ -2179,8 +2175,8 @@ The unit is bytes per second. Contained graph history objects may contain null values if the relay did not provide any bandwidth data or only data for less than 20% of a given time period. -<span class="blue">Scheduled to no longer contain a "3_months" graph and instead -a "6_months" graph after September 3, 2018.</span> +<span class="blue">Updated to no longer contain a "3_months" graph and instead a +"6_months" graph on September 10, 2018.</span> </p> </li> @@ -2304,7 +2300,7 @@ relay to be selected by clients. Keys are string representation of the time period covered by the graph history object. Keys are fixed strings <strong>"1_week"</strong>, -<strong>"1_month"</strong>, <strong>"3_months"</strong>, +<strong>"1_month"</strong>, <strong>"6_months"</strong>, <strong>"1_year"</strong>, and <strong>"5_years"</strong>. Keys refer to the last known weights history of a relay, not to the time when the weights document was published. @@ -2314,8 +2310,8 @@ period and higher data resolution. The unit is path-selection probability. Contained graph history objects may contain null values if the relay was running less than 20% of a given time period. -<span class="blue">Scheduled to no longer contain a "3_months" graph and instead -a "6_months" graph after September 3, 2018.</span> +<span class="blue">Updated to no longer contain a "3_months" graph and instead a +"6_months" graph on September 10, 2018.</span> </p> </li> @@ -2437,8 +2433,7 @@ Object containing graph history objects with the average number of clients connecting to this bridge. Keys are string representation of the time period covered by the graph history object. -Keys are fixed strings <strong>"1_week"</strong>, -<strong>"1_month"</strong>, <strong>"3_months"</strong>, +Keys are fixed strings <strong>"6_months"</strong>, <strong>"1_year"</strong>, and <strong>"5_years"</strong>. Keys refer to the last known clients history of a bridge, not to the time when the clients document was published. @@ -2448,8 +2443,8 @@ time period and higher data resolution. The unit is number of clients. Contained graph history objects may contain null values if the bridge did not report client statistics for at least 50% of a given time period. -<span class="blue">Scheduled to no longer contain "1_week", "1_month", and -"3_months" graphs and instead a "6_months" graph after September 3, 2018.</span> +<span class="blue">Updated to no longer contain "1_week", "1_month", and +"3_months" graphs and instead a "6_months" graph on September 10, 2018.</span> </p> </li> @@ -2503,7 +2498,7 @@ relay. Keys are string representation of the time period covered by the graph history object. Keys are fixed strings <strong>"1_week"</strong>, -<strong>"1_month"</strong>, <strong>"3_months"</strong>, +<strong>"1_month"</strong>, <strong>"6_months"</strong>, <strong>"1_year"</strong>, and <strong>"5_years"</strong>. Keys refer to the last known uptime history of a relay, not to the time when the uptime document was published. @@ -2513,8 +2508,8 @@ period and higher data resolution. The unit is fractional uptime from 0 to 1. Contained graph history objects may contain null values if less than 20% of network statuses have been processed for a given time period. -<span class="blue">Scheduled to no longer contain a "3_months" graph and instead -a "6_months" graph after September 3, 2018.</span> +<span class="blue">Updated to no longer contain a "3_months" graph and instead a +"6_months" graph on September 10, 2018.</span> </p> </li> [View Less]

1 0

[metrics-web/release] Adds link for tor-relays@ to contact information
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 3040394be33d9bd1f318643fee529e1a52c9c580 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Sep 11 12:13:03 2018 +0100 Adds link for tor-relays@ to contact information Some relay operators find this section from Relay Search and use it to request help for their relay on the metrics-team@ list which is suboptimal. This should help to reduce that. Fixes: #27635 --- src/main/resources/web/jsps/about.jsp | 2 ++ 1 file changed, 2 insertions(+) diff -… [View More]

1 0

[metrics-web/release] Fix another broken anchor.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 0547e1a4a46c27450518acdd49ec0a5d1229574f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 11 16:15:57 2018 +0200 Fix another broken anchor. --- src/main/resources/web/jsps/stats.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 9c8d158..b737bf7 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -594,7 +594,… [View More]

1 0

[metrics-web/release] Change graphs label from 3 Months to 6
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit b21c2cb666da2eab1286fe66636d057ccfb289e4 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Aug 7 14:05:49 2018 +0100 Change graphs label from 3 Months to 6 Fixes: #26983 --- src/main/resources/web/templates/rs/details/bridge.html | 8 ++++---- src/main/resources/web/templates/rs/details/router.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/web/templates/rs/details/bridge.html b/src/main/resources/web/… [View More]templates/rs/details/bridge.html index 69a1cd1..d4bf602 100644 --- a/src/main/resources/web/templates/rs/details/bridge.html +++ b/src/main/resources/web/templates/rs/details/bridge.html @@ -88,7 +88,7 @@ <ul class="nav nav-tabs"> <li id="history-1m-tab" class="history-tabs active"><a onclick="$('.history').hide();$('#history-1m').fadeIn();$('.history-tabs').removeClass('active');$('#history-1m-tab').addClass('active');">1 Month</a></li> - <li id="history-3m-tab" class="history-tabs"><a onclick="$('.history').hide();$('#history-3m').fadeIn();$('.history-tabs').removeClass('active');$('#history-3m-tab').addClass('active');">3 Months</a></li> + <li id="history-6m-tab" class="history-tabs"><a onclick="$('.history').hide();$('#history-6m').fadeIn();$('.history-tabs').removeClass('active');$('#history-6m-tab').addClass('active');">6 Months</a></li> <li id="history-1y-tab" class="history-tabs"><a onclick="$('.history').hide();$('#history-1y').fadeIn();$('.history-tabs').removeClass('active');$('#history-1y-tab').addClass('active');">1 Year</a></li> <li id="history-5y-tab" class="history-tabs"><a onclick="$('.history').hide();$('#history-5y').fadeIn();$('.history-tabs').removeClass('active');$('#history-5y-tab').addClass('active');">5 Years</a></li> </ul> @@ -120,7 +120,7 @@ </div> </div> </div> - <div id="history-3m" class="history tab-pane"> + <div id="history-6m" class="history tab-pane"> <div class="row"> <div class="col-md-6"> <div class="thumbnail"> @@ -129,7 +129,7 @@ <img src="/images/no-data-available.png" alt=""> </div> <div class="caption"> - <h5>3 Months graph</h5> + <h5>6 Months graph</h5> <a id="save_bw_months" href="">Save Graph</a> </div> </div> @@ -140,7 +140,7 @@ <img src="/images/no-data-available.png" alt=""> </div> <div class="caption"> - <h5>3 Months graph</h5> + <h5>6 Months graph</h5> <a id="save_clients_months" href="">Save Graph</a> </div> </div> diff --git a/src/main/resources/web/templates/rs/details/router.html b/src/main/resources/web/templates/rs/details/router.html index db5ec03..c746269 100644 --- a/src/main/resources/web/templates/rs/details/router.html +++ b/src/main/resources/web/templates/rs/details/router.html @@ -179,7 +179,7 @@ should update it as soon as possible.</div> <ul class="nav nav-tabs"> <li id="history-1m-tab" class="history-tabs active"><a onclick="$('.history').hide();$('#history-1m').fadeIn();$('.history-tabs').removeClass('active');$('#history-1m-tab').addClass('active');">1 Month</a></li> - <li id="history-3m-tab" class="history-tabs"><a onclick="$('.history').hide();$('#history-3m').fadeIn();$('.history-tabs').removeClass('active');$('#history-3m-tab').addClass('active');">3 Months</a></li> + <li id="history-6m-tab" class="history-tabs"><a onclick="$('.history').hide();$('#history-6m').fadeIn();$('.history-tabs').removeClass('active');$('#history-6m-tab').addClass('active');">6 Months</a></li> <li id="history-1y-tab" class="history-tabs"><a onclick="$('.history').hide();$('#history-1y').fadeIn();$('.history-tabs').removeClass('active');$('#history-1y-tab').addClass('active');">1 Year</a></li> <li id="history-5y-tab" class="history-tabs"><a onclick="$('.history').hide();$('#history-5y').fadeIn();$('.history-tabs').removeClass('active');$('#history-5y-tab').addClass('active');">5 Years</a></li> </ul> @@ -211,7 +211,7 @@ should update it as soon as possible.</div> </div> </div> </div> - <div id="history-3m" class="history tab-pane"> + <div id="history-6m" class="history tab-pane"> <div class="row"> <div class="col-md-6"> <div class="thumbnail"> @@ -219,7 +219,7 @@ should update it as soon as possible.</div> <img src="/images/no-data-available.png" alt=""> </div> <div class="caption"> - <h5>3 Months graph</h5> + <h5>6 Months graph</h5> <a id="save_bw_months" href="">Save Graph</a> </div> </div> @@ -230,7 +230,7 @@ should update it as soon as possible.</div> <img src="/images/no-data-available.png" alt=""> </div> <div class="caption"> - <h5>3 Months graph</h5> + <h5>6 Months graph</h5> <a id="save_weights_months" href="">Save Graph</a> </div> </div> [View Less]

1 0

[metrics-web/release] Fix graph anchors on stats.html.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit c155e355f06ab8ab8296e9e3993fd7ec19034568 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 11 15:53:49 2018 +0200 Fix graph anchors on stats.html. --- src/main/resources/web/jsps/stats.jsp | 58 +++++++++++++++++------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 52e0bb5..4736309 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/… [View More]resources/web/jsps/stats.jsp @@ -58,7 +58,7 @@ Users <a href="#users" name="users" class="anchor">#</a></h2> <h3>Relay users <a href="/userstats-relay-country.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/userstats-relay-country.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/userstats-relay-country">#</a></h3> +<a href="#userstats-relay-country" name="userstats-relay-country" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -83,7 +83,7 @@ Users <a href="#users" name="users" class="anchor">#</a></h2> <h3>Bridge users by country <a href="/userstats-bridge-country.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/userstats-bridge-country.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/userstats-bridge-country">#</a></h3> +<a href="#userstats-bridge-country" name="userstats-bridge-country"class="anchor">#</a></h3> <h4>Parameters</h4> @@ -105,7 +105,7 @@ Users <a href="#users" name="users" class="anchor">#</a></h2> <h3>Bridge users by transport <a href="/userstats-bridge-transport.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/userstats-bridge-transport.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/userstats-bridge-transport">#</a></h3> +<a href="#userstats-bridge-transport" name="userstats-bridge-transport" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -127,7 +127,7 @@ Users <a href="#users" name="users" class="anchor">#</a></h2> <h3>Bridge users by country and transport <a href="/userstats-bridge-combined.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/userstats-bridge-combined.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/userstats-bridge-combined">#</a></h3> +<a href="#userstats-bridge-combined" name="userstats-bridge-combined" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -151,7 +151,7 @@ Users <a href="#users" name="users" class="anchor">#</a></h2> <h3>Bridge users by IP version <a href="/userstats-bridge-version.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/userstats-bridge-version.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/userstats-bridge-version">#</a></h3> +<a href="#userstats-bridge-version" name="userstats-bridge-version" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -180,7 +180,7 @@ Servers <a href="#servers" name="servers" class="anchor">#</a></h2> <h3>Relays and bridges <a href="/networksize.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/networksize.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/networksize">#</a></h3> +<a href="#networksize" name="networksize" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -200,7 +200,7 @@ Servers <a href="#servers" name="servers" class="anchor">#</a></h2> <h3>Relays by relay flag <a href="/relayflags.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/relayflags.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/relayflags">#</a></h3> +<a href="#relayflags" name="relayflags" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -221,7 +221,7 @@ Servers <a href="#servers" name="servers" class="anchor">#</a></h2> <h3>Relays by tor version <a href="/versions.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/versions.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/versions">#</a></h3> +<a href="#versions" name="versions" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -241,7 +241,7 @@ Servers <a href="#servers" name="servers" class="anchor">#</a></h2> <h3>Relays by platform <a href="/platforms.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/platforms.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/platforms">#</a></h3> +<a href="#platforms" name="platforms" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -264,7 +264,7 @@ Servers <a href="#servers" name="servers" class="anchor">#</a></h2> <h3>Relays by IP version <a href="/relays-ipv6.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/relays-ipv6.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/relays-ipv6">#</a></h3> +<a href="#relays-ipv6" name="relays-ipv6" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -286,7 +286,7 @@ Servers <a href="#servers" name="servers" class="anchor">#</a></h2> <h3>Bridges by IP version <a href="/bridges-ipv6.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/bridges-ipv6.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/bridges-ipv6">#</a></h3> +<a href="#bridges-ipv6" name="bridges-ipv6" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -312,7 +312,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <h3>Total relay bandwidth <a href="/bandwidth.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/bandwidth.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/bandwidth">#</a></h3> +<a href="#bandwidth" name="bandwidth" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -332,7 +332,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <h3>Advertised and consumed bandwidth by relay flag <a href="/bandwidth-flags.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/bandwidth-flags.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/bandwidth-flags">#</a></h3> +<a href="#bandwidth-flags" name="bandwidth-flags" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -354,7 +354,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <h3>Advertised bandwidth by IP version <a href="/advbw-ipv6.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/advbw-ipv6.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/advbw-ipv6">#</a></h3> +<a href="#advbw-ipv6" name="advbw-ipv6" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -378,7 +378,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <h3>Advertised bandwidth distribution <a href="/advbwdist-perc.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/advbwdist-perc.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/advbwdist-perc">#</a></h3> +<a href="#advbwdist-perc" name="advbwdist-perc" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -400,7 +400,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <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> <a href="/advbwdist-relay.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/advbwdist-relay">#</a></h3> +<a href="#advbwdist-relay" name="advbwdist-relay" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -422,7 +422,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <h3>Consumed bandwidth by Exit/Guard flag combination <a href="/bwhist-flags.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/bwhist-flags.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/bwhist-flags">#</a></h3> +<a href="#bwhist-flags" name="bwhist-flags" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -444,7 +444,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <h3>Bandwidth spent on answering directory requests <a href="/dirbytes.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/dirbytes.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/dirbytes">#</a></h3> +<a href="#dirbytes" name="dirbytes" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -464,7 +464,7 @@ Traffic <a href="#traffic" name="traffic" class="anchor">#</a></h2> <h3>Fraction of connections used uni-/bidirectionally <a href="/connbidirect.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/connbidirect.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/connbidirect">#</a></h3> +<a href="#connbidirect" name="connbidirect" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -492,7 +492,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <h3>Time to download files over Tor <a href="/torperf.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/torperf.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/torperf">#</a></h3> +<a href="#torperf" name="torperf" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -519,7 +519,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <h3>Timeouts and failures of downloading files over Tor <a href="/torperf-failures.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/torperf-failures.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/torperf-failures">#</a></h3> +<a href="#torperf-failures" name="torperf-failures" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -545,7 +545,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <h3>Circuit build times <a href="/onionperf-buildtimes.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/onionperf-buildtimes.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/onionperf-buildtimes">#</a></h3> +<a href="#onionperf-buildtimes" name="onionperf-buildtimes" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -569,7 +569,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <h3>Circuit round-trip latencies <a href="/onionperf-latencies.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/onionperf-latencies.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/onionperf-latencies">#</a></h3> +<a href="#onionperf-latencies" name="onionperf-latencies" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -599,7 +599,7 @@ Onion Services <a href="#onion-services" name="servers" class="anchor">#</a></h2 <h3>Unique .onion addresses (version 2 only) <a href="/hidserv-dir-onions-seen.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/hidserv-dir-onions-seen.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/hidserv-dir-onions-seen">#</a></h3> +<a href="#hidserv-dir-onions-seen" name="hidserv-dir-onions-seen" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -619,7 +619,7 @@ Onion Services <a href="#onion-services" name="servers" class="anchor">#</a></h2 <h3>Onion-service traffic (versions 2 and 3) <a href="/hidserv-rend-relayed-cells.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/hidserv-rend-relayed-cells.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/hidserv-rend-relayed-cells">#</a></h3> +<a href="#hidserv-rend-relayed-cells" name="hidserv-rend-relayed-cells" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -645,7 +645,7 @@ Applications <a href="#applications" name="applications" class="anchor">#</a></h <h3>Tor Browser downloads and updates <a href="/webstats-tb.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/webstats-tb.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/webstats-tb">#</a></h3> +<a href="#webstats-tb" name="webstats-tb" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -667,7 +667,7 @@ Applications <a href="#applications" name="applications" class="anchor">#</a></h <h3>Tor Browser downloads by platform <a href="/webstats-tb-platform.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/webstats-tb-platform.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/webstats-tb-platform">#</a></h3> +<a href="#webstats-tb-platform" name="webstats-tb-platform" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -688,7 +688,7 @@ Applications <a href="#applications" name="applications" class="anchor">#</a></h <h3>Tor Browser downloads by locale <a href="/webstats-tb-locale.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/webstats-tb-locale.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/webstats-tb-locale">#</a></h3> +<a href="#webstats-tb-locale" name="webstats-tb-locale" class="anchor">#</a></h3> <h4>Parameters</h4> @@ -708,7 +708,7 @@ Applications <a href="#applications" name="applications" class="anchor">#</a></h <h3>Tor Messenger downloads and updates <a href="/webstats-tm.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> <a href="/webstats-tm.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> -<a href="/webstats-tm">#</a></h3> +<a href="#webstats-tm" name="webstats-tm" class="anchor">#</a></h3> <h4>Parameters</h4> [View Less]

1 0

[metrics-web/release] Fix broken anchor.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 5a208ea67e06deb214152b75c0001dec4ec18a8b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 11 15:59:51 2018 +0200 Fix broken anchor. --- src/main/resources/web/jsps/reproducible-metrics.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/jsps/reproducible-metrics.jsp b/src/main/resources/web/jsps/reproducible-metrics.jsp index 8c72ffc..c590142 100644 --- a/src/main/resources/web/jsps/reproducible-metrics.jsp +++ b/… [View More]

1 0

[metrics-web/release] Use "as" field for bubble graphs
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit b74b569361ca3b9bc4b0c96dcd8632c11c58dd61 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Sep 12 10:23:10 2018 +0100 Use "as" field for bubble graphs --- src/main/resources/web/js/bubbles.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/web/js/bubbles.js b/src/main/resources/web/js/bubbles.js index b8c7194..ca88505 100644 --- a/src/main/resources/web/js/bubbles.js +++ b/src/main/resources/web/js/bubbles.js @@ -7,9 +7,9 @@ var … [View More]

1 0