January 2017 - tor-commits - lists.torproject.org

[metrics-web/master] Update content on secondary navigation pages.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit ef05c30ad3ffd27acfd0ee8315f509d585e2b423 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 23 11:02:10 2016 +0100 Update content on secondary navigation pages. --- website/web/WEB-INF/about.jsp | 29 ++++++---------- website/web/WEB-INF/development.jsp | 41 +++++++++++----------- website/web/WEB-INF/news.jsp | 11 +++--- website/web/WEB-INF/operation.jsp | 48 ++++++++++++++++++-------- website/web/WEB-INF/research.jsp | 36 ++++++-------------- website/web/WEB-INF/sources.jsp | 68 ++++++++----------------------------- 6 files changed, 95 insertions(+), 138 deletions(-) diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp index f51dc6a..208b80f 100644 --- a/website/web/WEB-INF/about.jsp +++ b/website/web/WEB-INF/about.jsp @@ -13,45 +13,36 @@ </div> <div class="container"> - <h1>About <a href="#about" name="about" class="anchor">#</a></h1> - - <p>Tor metrics are updated daily to provide transparency for Tor users, give feedback for developers, and measure evidence of network anomalies.</p> + <p>You're curious who has put together all this information, and you're thinking about contributing? Here we tell you a bit about the Tor metrics team and give you some pointers for joining our team.</p> </div> <div class="container"> - - <br> - <h2>Philosophy <a href="#philosophy" name="philosophy" class="anchor">#</a></h2> - <p>We only use public, non-sensitive data for metrics. Each metric goes through a rigorous review and discussion process before appearing here. We never publish statistics—or aggregate statistics—of sensitive data, such as unencrypted contents of traffic.</p> + </div> - <br> - + <div class="container"> <h2>Contributing <a href="#contributing" name="contributing" class="anchor">#</a></h2> + <p>Collecting and processing new data won't likely happen without your help! If you really want to see something measured here, we would be happy to work with you. Learn more about contributing on our <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/MetricsTeam" target="_blank">team wiki page</a>.</p> + </div> - <p>Collecting and processing new data won't likely happen without your help! If you really want to see something measured here, we would be happy to work with you. (Link to Trac wiki page)</p> - - <br> - + <div class="container"> <h2>Contact <a href="#contact" name="contact" class="anchor">#</a></h2> + <p>If you have any questions or suggestions, contact us at <a href="mailto:metrics-team@lists.torproject.org">metrics-team(a)lists.torproject.org</a>, which is a <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/metrics-team" target="_blank">public mailing list</a>.</p> + </div> - <p>If you have any questions, contact us at <a href="mailto:metrics-team@lists.torproject.org">metrics-team(a)lists.torproject.org</a>.</p> - - <br> - + <div class="container"> <h2>Testimonials <a href="#testimonials" name="testimonials" class="anchor">#</a></h2> <blockquote> <p class="mb-0"> Metrics are a critical part of any security technology. If you don't know how the technology works in practice, you can't find and fix problems. You can't improve the security. You can't make it work better. This isn't glamorous or sexy work, but it's essential. This is especially true for security and privacy, where our preconceived notions of threats and usage are regularly wrong—and knowing what's really going on is the difference between security and insecurity.<br><br> Tor is doing cutting-edge work in the anonymity space, and Tor metrics are already proven to provide critical information for research and development. It's one of the few open data sets available for how, why, where, and when people use anonymizing technologies.<br><br> Tor's metrics project increases the transparency of Tor's work. This helps users understand how Tor works. With good network metrics, you can look back for indicators and anomalies at the time a privacy issue was reported. You can also extrapolate and look forward to prevent related issues in the future. This helps alleviate users' security concerns, and helps others contribute to security issues in the network and browser.<br><br> - Finally, Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective. It's where the real world influences Tor. + Finally, Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective. It's where the real world influences Tor.” </p> <footer class="blockquote-footer">Bruce Schneier (June 1, 2016)</footer> </blockquote> - </div> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/development.jsp b/website/web/WEB-INF/development.jsp index 183df9c..ad20927 100644 --- a/website/web/WEB-INF/development.jsp +++ b/website/web/WEB-INF/development.jsp @@ -13,26 +13,27 @@ </div> <div class="container"> - <h1>Development</h1> -<ul> -<li><a href="https://play.google.com/store/apps/details?id=com.networksaremadeofstring.a…">AnOnionooid</a> is an Android app that helps find and explore Tor relays and bridges.</li> -<li>Tor's <a href="https://gitweb.torproject.org/tor.git/tree/scripts/maint/updateFallbackDirs…">fallback directories script</a> generates a list of stable directories.</li> -<li><a href="https://github.com/duk3luk3/onion-py">OnionPy</a> provides memcached support to cache queried data.</li> -<li><a href="https://nos-oignons.net/Services/index.en.html">Nos oignons</a> visualizes bandwidth histories of their relays.</li> -<li><a href="https://metrics.torproject.org/uncharted-data-flow.html">metrics-lib</a> is a Java library to fetch and pars -e Tor descriptors.</li> -<li><a href="https://stem.torproject.org/">Stem</a> is a Python library that parses Tor descriptors.</li> -<li><a href="https://github.com/meejah/txtorcon">Txtorcon</a> is an asynchronous Tor controller library written in Twiste -d Python.</li> -<li><a href="https://github.com/NullHypothesis/zoossh">Zoossh</a> is a parser written in Go for Tor-specific data formats -.</li> -<li><a href="https://savannah.nongnu.org/projects/koninoo/">koninoo</a> is a simple Java command line interface for query -ing Onionoo data.</li> -<li><a href="https://gitweb.torproject.org/user/phw/exitmap.git">Exitmap</a> is a fast and extensible scanner for Tor exi -t relays.</li> -<li><a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">Sybilhunter</a> attempts to detect Sybil attacks on - the Tor network.</li> -</ul> + <h1>Development <a href="#development" name="development" class="anchor">#</a></h1> + <p>You're a developer and want to write a tool that uses Tor network data? Here we're collecting programming libraries, APIs, and links to other code bases to get inspiration from.</p> + </div> + + <div class="container"> + <h2>Parsing libraries <a href="#libraries" name="libraries" class="anchor">#</a></h2> + <p>The following libraries help you with parsing Tor network data from the <a href="https://collector.torproject.org/" target="_blank">CollecTor</a> service.</p> + <ul> + <li><a href="https://dist.torproject.org/descriptor/" target="_blank">metrics-lib</a> is a Java library to fetch and parse Tor descriptors.</li> + <li><a href="https://stem.torproject.org/" target="_blank">Stem</a> is a Python library that parses Tor descriptors.</li> + <li><a href="https://github.com/NullHypothesis/zoossh" target="_blank">Zoossh</a> is a parser written in Go for Tor-specific data formats.</li> + </ul> + </div> + + <div class="container"> + <h2>Query support <a href="#query" name="query" class="anchor">#</a></h2> + <p>The following tools help you with querying Tor network data from the <a href="https://onionoo.torproject.org/" target="_blank">Onionoo</a> service.</p> + <ul> + <li><a href="https://savannah.nongnu.org/projects/koninoo/" target="_blank">koninoo</a> is a simple Java command line interface for querying Onionoo data.</li> + <li><a href="https://github.com/duk3luk3/onion-py" target="_blank">OnionPy</a> provides memcached support to cache queried data.</li> + </ul> </div> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/news.jsp b/website/web/WEB-INF/news.jsp index a15009e..c5d86a0 100644 --- a/website/web/WEB-INF/news.jsp +++ b/website/web/WEB-INF/news.jsp @@ -14,20 +14,17 @@ <div class="container"> <h1>News <a href="#news" name="news" class="anchor">#</a></h1> - <p>We collect reports of events and aggregate them here for your convenience. The process is usually pretty informal. Someone tells us of an event, reports it to us, and we aggregate them here. If you know of any event that may have caused a measurement anomaly, help us add it to this list.</p> + <p>You're a journalist or more generally a person who wants to know what's going on in the Tor network? We're collecting unusual events in the Tor network together with any insights we have into what we think has happened.</p> </div> - <div class="container"> <c:forEach var="category" items="${news}" varStatus="status"> - <c:if test="${not status.first}"><hr></c:if> + <div class="container"> <h2>${category.key[0]} <a href="#${category.key[1]}" name="${category.key[1]}" class="anchor">#</a></h2> <c:forEach var="entry" items="${category.value}"> - <p>${entry[0]}</p> - <br> + <p>${entry[0]}<br></p> </c:forEach> - </c:forEach> - </div> + </c:forEach> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/operation.jsp b/website/web/WEB-INF/operation.jsp index 8888183..5ee2b77 100644 --- a/website/web/WEB-INF/operation.jsp +++ b/website/web/WEB-INF/operation.jsp @@ -13,20 +13,40 @@ </div> <div class="container"> - <h1>Operation</h1> -<ul> -<li><a href="https://exonerator.torproject.org/">ExoneraTor</a> tells you if an IP was used by a Tor relay on a given date.</li> -<li><a href="https://atlas.torproject.org/">Atlas</a> displays data about single relays and bridges in the Tor network.</li> -<li><a href="https://compass.torproject.org/">Compass</a> groups current relays in different ways to measure Tor's network diversity.</li> -<li><a href="https://oniontip.com/">OnionTip</a> distributes bitcoin donations to relays that can receive them.</li> -<li><a href="https://consensus-health.torproject.org/">Consensus Health</a> displays information about the current directory consensus and votes.</li> -<li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health">Consensus Issues</a> emails directory authority operators about consensus problems.</li> -<li><a href="https://onionview.codeplex.com/">Check</a> uses<a href="https://www.torproject.org/projects/tordnsel.html.en">TorDNSEL</a> data to tell users whether they are using Tor or not.</li> -<li><a href="http://lists.infolabe.net/lists/listinfo/infolabe-anomalies">OII's anomaly detection system</a> ranks countries by how anomalous their Tor usage is.</li> -<li><a href="https://tor-explorer-10kapart2016.azurewebsites.net/">Tor Explorer</a> displays data on each individual Tor node.</li> -<li>A <a href="https://duckduckgo.com/">DuckDuckGo</a> search with "tor node" keywords displays Tor node details.</li> -<li><a href="https://onionview.codeplex.com/">OnionView</a> plots the location of active Tor nodes on an interactive map of the world.</li> -</ul> + <h1>Operation <a href="#operation" name="operation" class="anchor">#</a></h1> + <p>You're operating a Tor relay or bridge, or you're affected in some way by somebody else operating one? Here you can learn everything about currently running Tor nodes or even about nodes that have been running in the past.</p> + </div> + + <div class="container"> + <h2>Network archive <a href="#archive" name="archive" class="anchor">#</a></h2> + <p>The following tool lets you browse the network archive for relays running in the past.</p> + <ul> + <li><a href="https://exonerator.torproject.org/" target="_blank">ExoneraTor</a> tells you if an IP was used by a Tor relay on a given date.</li> + </ul> + </div> + + <div class="container"> + <h2>Network status <a href="#status" name="status" class="anchor">#</a></h2> + <p>The following tools let you explore currently running relays and bridges.</p> + <ul> + <li><a href="https://play.google.com/store/apps/details?id=com.networksaremadeofstring.a…" target="_blank">AnOnionooid</a> is an Android app that helps find and explore Tor relays and bridges.</li> + <li><a href="https://atlas.torproject.org/" target="_blank">Atlas</a> displays data about single relays and bridges in the Tor network.</li> + <li><a href="https://compass.torproject.org/" target="_blank">Compass</a> groups current relays in different ways to measure Tor's network diversity.</li> + <li><a href="https://consensus-health.torproject.org/" target="_blank">Consensus Health</a> displays information about the current directory consensus and votes.</li> + <li><a href="https://duckduckgo.com/" target="_blank">DuckDuckGo</a> displays Tor node details when including the keywords "tor node" in a search.</li> + <li><a href="https://oniontip.com/" target="_blank">OnionTip</a> distributes bitcoin donations to relays that can receive them.</li> + <li><a href="https://onionview.codeplex.com/" target="_blank">OnionView</a> plots the location of active Tor nodes on an interactive map of the world.</li> + <li><a href="https://tor-explorer-10kapart2016.azurewebsites.net/" target="_blank">Tor Explorer</a> displays data on each individual Tor node.</li> + </ul> + </div> + + <div class="container"> + <h2>Network health notifications <a href="#health" name="health" class="anchor">#</a></h2> + <p>The following tools inform you of any problems with relays and bridges.</p> + <ul> + <li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health" target="_blank">Consensus Issues</a> emails directory authority operators about consensus problems.</li> + <li><a href="http://lists.infolabe.net/lists/listinfo/infolabe-anomalies" target="_blank">OII's anomaly detection system</a> ranks countries by how anomalous their Tor usage is.</li> + </ul> </div> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/research.jsp b/website/web/WEB-INF/research.jsp index 82e1680..57438fc 100644 --- a/website/web/WEB-INF/research.jsp +++ b/website/web/WEB-INF/research.jsp @@ -14,16 +14,12 @@ <div class="container"> <h1>Research <a href="#research" name="research" class="anchor">#</a></h1> - <p>Tor started out as a research project! We encourage research on all things Tor.</p> - <p>Look around the papers section below for some ideas on what others have researched in the past. Contact <a href="mailto:#">[some general email list here, torproject?]</a> if you want to discuss ideas.</p> - + <p>You're a researcher and want to write a paper related to the public, deployed Tor network? Here you'll find other relevant papers to cite, technical reports to understand all the details, and existing tools to conduct research on the Tor network.</p> </div> <div class="container"> - - <h2>Feel free to use our data for your research! <a href="#use" name="use" class="anchor">#</a></h2> - - <p>If you do, please cite <a href="https://metrics.torproject.org/" target="_self">https://metrics.torproject.org/</a> or the following <a href="http://freehaven.net/anonbib/#wecsr10measuring-tor" target="_blank">paper</a>:</p> + <h2>Citation <a href="#cite" name="cite" class="anchor">#</a></h2> + <p>Feel free to use our data for your research. If you do, please cite <a href="https://metrics.torproject.org/" target="_self">https://metrics.torproject.org/</a> or the following <a href="http://freehaven.net/anonbib/#wecsr10measuring-tor" target="_blank">paper</a>:</p> <p><pre> @inproceedings{wecsr10measuring-tor, title = {A Case Study on Measuring Statistical Data in the {T}or Anonymity Network}, @@ -36,30 +32,20 @@ series = {LNCS}, }</pre></p> <p>Thank you for acknowledging this work through a citation.</p> - </div> <div class="container"> - - <h2>Want to collect your own data for research? <a href="#collect" name="collect" class="anchor">#</a></h2> - <p>Look at the <a href="sources.html">sources page</a> for services that collect Tor-related data.</p> - + <h2>Technical reports <a href="#techreports" name="techreports" class="anchor">#</a></h2> + <p>From time to time we're writing <a href="https://research.torproject.org/techreports.html" target="_blank">technical reports</a> with further details on how we collect statistics in the Tor network or how we use them to learn new interesting facts. Be sure to take a look!</p> </div> - <div class="container"> - - <h2>Research Papers <a href="#research" name="research" class="anchor">#</a></h2> - <p>Here are some Tor-related papers. (...) If we're missing yours, let us know!</p> - - </div> - - <div class="container"> -<ul> -<li><a href="https://torps.github.io/">TorPS</a> simulates changes to Tor's path selection algorithm using archived data.</li> -<li><a href="https://shadow.github.io/">Shadow</a> uses archived Tor directory data to generate realistic network topolog -ies.</li> -</ul> + <h2>Research tools <a href="#tools" name="tools" class="anchor">#</a></h2> + <p>The following tools are primarily useful if you want to do research using Tor network data.</p> + <ul> + <li><a href="https://torps.github.io/" target="_blank">TorPS</a> simulates changes to Tor's path selection algorithm using archived data.</li> + <li><a href="https://shadow.github.io/" target="_blank">Shadow</a> uses archived Tor directory data to generate realistic network topologies.</li> + </ul> </div> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/sources.jsp b/website/web/WEB-INF/sources.jsp index de71883..ff320bd 100644 --- a/website/web/WEB-INF/sources.jsp +++ b/website/web/WEB-INF/sources.jsp @@ -21,15 +21,13 @@ <h2>Network archives <a href="#archive" name="archive" class="anchor">#</a></h2> <p>We get our data from the network archives below.</p> <div class="row"> - <div class="col-md-3 col-sm-4 col-xs-6"> <a href="https://collector.torproject.org/" target="_blank"> <div class="logo" style="background-image:url(images/collector-logo.png);"></div> <h2>CollecTor</h2> - <p>collects data from various nodes and services in the public Tor network.</p> + <p>collects and archives data from various nodes and services in the public Tor network.</p> </a> </div> - <div class="col-md-3 col-sm-4 col-xs-6"> <a href="https://ooni.torproject.org/" target="_blank"> <div class="logo" style="background-image:url(images/ooni-logo.png);"></div> @@ -37,64 +35,28 @@ <p>detects censorship, surveillance, and traffic manipulation on the internet.</p> </a> </div> - </div> </div> - <div class="container tools"> + <div class="container"> <h2>Measurement tools <a href="#measurement" name="measurement" class="anchor">#</a></h2> - <p>The following tools perform active measurements in the Tor network. (They don't have pretty logos yet, but they are all uniquely useful!)</p> - <div class="row"> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="https://www.torproject.org/projects/tordnsel.html.en" target="_blank"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>TorDNSEL</h3> - <p>publishes lists of IP addresses of multi-homed Tor exits.</p> - </a> - </div> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="https://gitweb.torproject.org/torperf.git" target="_blank"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>Torperf</h3> - <p>measures Tor performance with a set of utilities and Python scripts.</p> - </a> - </div> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="https://github.com/robgjansen/onionperf" target="_blank"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>OnionPerf</h3> - <p>measures the performance of onion services.</p> - </a> - </div> - - </div> + <p>The following tools perform active measurements in the Tor network.</p> + <ul> + <li><a href="https://gitweb.torproject.org/user/phw/exitmap.git" target="_blank">Exitmap</a> is a fast and extensible scanner for Tor exit relays.</li> + <li><a href="https://www.torproject.org/projects/tordnsel.html.en" target="_blank">TorDNSEL</a> publishes lists of IP addresses of multi-homed Tor exits.</li> + <li><a href="https://gitweb.torproject.org/torperf.git" target="_blank">Torperf</a> measures Tor performance with a set of utilities and Python scripts.</li> + <li><a href="https://github.com/robgjansen/onionperf" target="_blank">OnionPerf</a> measures the performance of onion services.</li> + <li><a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/" target="_blank">Sybilhunter</a> attempts to detect Sybil attacks onthe Tor network.</li> + </ul> </div> - <div class="container tools"> + <div class="container"> <h2>Pre-aggregated data <a href="#aggregated" name="aggregated" class="anchor">#</a></h2> <p>Sometimes the data from the original sources can be hard to process. If you want to take a little shortcut, try out the following pre-aggregated statistics.</p> - <div class="row"> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="stats.html"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>CSV files</h3> - <p>are available with aggregated statistics of visualizations on this site.</p> - </a> - </div> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="https://onionoo.torproject.org/" target="_blank"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>Onionoo</h3> - <p>provides current and historical data about relays and bridges via a web-based API.</p> - </a> - </div> - - </div> + <ul> + <li><a href="stats.html">CSV files</a> are available with aggregated statistics of visualizations on this site.</li> + <li><a href="https://onionoo.torproject.org/" target="_blank">Onionoo</a> provides current and historical data about relays and bridges via a web-based API.</li> + </ul> </div> <jsp:include page="bottom.jsp"/>

1 0

[metrics-web/master] Disable Applications category on start page.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 336f353c6074e9cdc587b9de2600652720623784 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 23 12:35:37 2016 +0100 Disable Applications category on start page. --- website/etc/categories.json | 2 +- website/web/css/style.css | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/website/etc/categories.json b/website/etc/categories.json index 832f3c0..8b4ea77 100644 --- a/website/etc/categories.json +++ b/website/etc/categories.json @@ -77,7 +77,7 @@ "id": "applications", "icon": "fa-download", "header": "Applications", - "summary": "How many Tor applications, like Tor Browser, have been downloaded or updated (coming soon).", + "summary": "How many Tor applications, like Tor Browser, have been downloaded or updated.", "metrics": [] } ] diff --git a/website/web/css/style.css b/website/web/css/style.css index 2b97b34..b1d390d 100644 --- a/website/web/css/style.css +++ b/website/web/css/style.css @@ -386,18 +386,22 @@ body .topButton { border:1px solid #ccc; border-radius:5px; padding:2em 2em 1em 2em; + color:#999; +} +.dashboard h2, .dashboard p { + color:#999; } -.dashboard a:hover { +.dashboard a[href], .dashboard a[href]:hover, .dashboard a[href]:focus, .dashboard a[href]:active, .dashboard a[href] h2 { + color:#68b030; +} +.dashboard a[href]:hover { background-color: #F8f8f8; } /* fixed box height by screen size: */ @media (min-width: 1200px) { .dashboard a, .dashboard a:hover, .dashboard a:focus, .dashboard a:active { min-height:260px; } } @media (min-width: 992px) and (max-width: 1199.99999px) { .dashboard a, .dashboard a:hover, .dashboard a:focus, .dashboard a:active { min-height:290px; } } @media (min-width: 768px) and (max-width: 991.99999px) { .dashboard a, .dashboard a:hover, .dashboard a:focus, .dashboard a:active { min-height:280px; } } -.dashboard h2 { - color:#68b030; -} -.dashboard p { +.dashboard a[href] p { color:black; } @media (max-width: 767.99999px) {

1 0

[metrics-web/master] Style forms some more.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit eb34d962c00e25e4e4ba85ac51470b37afa78b88 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 23 13:41:28 2016 +0100 Style forms some more. --- website/web/WEB-INF/graph.jsp | 44 ++++++++++++++++++------------------------- website/web/css/style.css | 8 +++++++- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/website/web/WEB-INF/graph.jsp b/website/web/WEB-INF/graph.jsp index 564b563..3de60ac 100644 --- a/website/web/WEB-INF/graph.jsp +++ b/website/web/WEB-INF/graph.jsp @@ -54,7 +54,7 @@ </p> </c:if> <c:if test="${fn:length(p) > 0}"> - <p>Percentiles: + <p><b>Percentiles:</b> <c:forEach var="row" items="${p}"> <label class="checkbox-label"> <input type="checkbox" name="p" value="${row[0]}"${row[1]}> ${row[2]} @@ -63,7 +63,7 @@ </p> </c:if> <c:if test="${fn:length(n) > 0}"> - <p>n: + <p><b>n:</b> <c:forEach var="row" items="${n}"> <label class="checkbox-label"> <input type="checkbox" name="n" value="${row[0]}"${row[1]}> ${row[0]} @@ -73,20 +73,16 @@ </c:if> <c:if test="${fn:length(flag) > 0}"> <p> - <fieldset> - <legend>Relay flags:</legend> - <c:forEach var="row" items="${flag}"> - <p> - <input type="checkbox" name="flag" value="${row[0]}" id="flag_${row[0]}"${row[1]}> - <label class="checkbox-label" for="flag_${row[0]}">${row[0]}</label> - </p> - </c:forEach> - </fieldset> + <b>Relay flags:</b> + <c:forEach var="row" items="${flag}"> + <input type="checkbox" name="flag" value="${row[0]}" id="flag_${row[0]}"${row[1]}> + <label class="checkbox-label" for="flag_${row[0]}">${row[0]}</label> + </c:forEach> </p> </c:if> <c:if test="${fn:length(country) > 0}"> <p> - <label for="country">Source:</label> + <label for="country"><b>Source:</b></label> <select name="country" id="country"> <c:forEach var="row" items="${country}"> <option value="${row[0]}"${row[1]}>${row[2]}</option> @@ -96,8 +92,8 @@ </c:if> <c:if test="${fn:length(events) > 0}"> <p> - <label for="events">Show possible censorship events if available (<a - href="http://research.torproject.org/techreports/detector-2011-09-09.pdf">BETA</a>)</label> + <label for="events"><b>Show possible censorship events if available (<a + href="http://research.torproject.org/techreports/detector-2011-09-09.pdf">BETA</a>):</b></label> <select name="events" id="events"> <c:forEach var="row" items="${events}"> <option value="${row[0]}"${row[1]}>${row[2]}</option> @@ -107,20 +103,16 @@ </c:if> <c:if test="${fn:length(transport) > 0}"> <p> - <fieldset> - <legend>Source:</legend> - <c:forEach var="row" items="${transport}"> - <p> - <input type="checkbox" name="transport" value="${row[0]}" id="transport_${row[0]}"${row[1]}> - <label class="checkbox-label" for="transport_${row[0]}">${row[2]}</label> - </p> - </c:forEach> - </fieldset> + <b>Source:</b> + <c:forEach var="row" items="${transport}"> + <input type="checkbox" name="transport" value="${row[0]}" id="transport_${row[0]}"${row[1]}> + <label class="checkbox-label" for="transport_${row[0]}">${row[2]}</label> + </c:forEach> </p> </c:if> <c:if test="${fn:length(version) > 0}"> <p> - <label for="version">Source:</label> + <label for="version"><b>Source:</b></label> <select name="version" id="version"> <c:forEach var="row" items="${version}"> <option value="${row[0]}"${row[1]}>${row[2]}</option> @@ -129,7 +121,7 @@ </p> </c:if> <c:if test="${fn:length(source) > 0}"> - <p>Source: + <p><b>Source:</b> <c:forEach var="row" items="${source}"> <label class="radio-label"> <input type="radio" name="source" value="${row[0]}"${row[1]}> ${row[0]} @@ -138,7 +130,7 @@ </p> </c:if> <c:if test="${fn:length(filesize) > 0}"> - <p>File size: + <p><b>File size:</b> <c:forEach var="row" items="${filesize}"> <label class="radio-label"> <input type="radio" name="filesize" value="${row[0]}"${row[1]}> ${row[2]} diff --git a/website/web/css/style.css b/website/web/css/style.css index b1d390d..1e54398 100644 --- a/website/web/css/style.css +++ b/website/web/css/style.css @@ -734,9 +734,15 @@ form input, form select { width:100%; max-width:200px; } -form input[type=checkbox] { +form input[type=checkbox], form input[type=radio] { width:20px; } +label.checkbox-label, label.radio-label { + max-width: initial; + width: auto; + font-weight: normal; + margin-right: 20px; +}

1 0

[metrics-web/master] Add onionoo-node-client to the development page.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit ab63757c89890a9207b36c15f42db7228aba6f9a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 1 09:07:04 2017 +0100 Add onionoo-node-client to the development page. --- website/web/WEB-INF/development.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/website/web/WEB-INF/development.jsp b/website/web/WEB-INF/development.jsp index ad20927..fe6fe0b 100644 --- a/website/web/WEB-INF/development.jsp +++ b/website/web/WEB-INF/development.jsp @@ -33,6 +33,7 @@ <ul> <li><a href="https://savannah.nongnu.org/projects/koninoo/" target="_blank">koninoo</a> is a simple Java command line interface for querying Onionoo data.</li> <li><a href="https://github.com/duk3luk3/onion-py" target="_blank">OnionPy</a> provides memcached support to cache queried data.</li> + <li><a href="https://github.com/lukechilds/onionoo-node-client" target="_blank">onionoo-node-client</a> is a Node.js client library for the <a href="https://onionoo.torproject.org/" target="_blank">Onionoo</a> API.</li> </ul> </div>

1 0

[metrics-web/master] Change remaining hidden services to onion services.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 50a5f536b5bbe0a0880a71e454600361a5e02a71 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 4 12:10:54 2017 +0100 Change remaining hidden services to onion services. --- website/rserve/graphs.R | 6 +++--- website/web/WEB-INF/stats.jsp | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index 5c296a8..9f8daa7 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -1059,7 +1059,7 @@ plot_hidserv_rend_relayed_cells <- function(start, end, path) { breaks = date_breaks$major, minor_breaks = date_breaks$minor) + scale_y_continuous(name = "") + - ggtitle("Hidden-service traffic in Mbit/s\n") + ggtitle("Onion-service traffic in Mbit/s\n") ggsave(filename = path, width = 8, height = 5, dpi = 72) } @@ -1087,9 +1087,9 @@ plot_hidserv_frac_reporting <- function(start, end, path) { scale_y_continuous(name = "", labels = percent) + scale_colour_hue(name = "", breaks = c("rend-relayed-cells", "dir-onions-seen"), - labels = c("Hidden-service traffic", + labels = c("Onion-service traffic", "Unique .onion addresses")) + - ggtitle(paste("Fraction of relays reporting hidden-service", + ggtitle(paste("Fraction of relays reporting onion-service", "statistics")) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 72) diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp index fd12099..9ad99fc 100644 --- a/website/web/WEB-INF/stats.jsp +++ b/website/web/WEB-INF/stats.jsp @@ -398,13 +398,13 @@ fractions for the three directions "read", "write", and "both" sum up to exactly </div> <div class="container"> -<h2>Hidden-service statistics <a href="#hidserv" name="hidserv" class="anchor">#</a></h2> +<h2>Onion-service statistics <a href="#hidserv" name="hidserv" class="anchor">#</a></h2> <p>The following data file contains <a -href="glossary.html#hidden-service">hidden-service</a> statistics gathered by a +href="glossary.html#onion-service">onion-service</a> statistics gathered by a small subset of <a href="glossary.html#relay">relays</a> and extrapolated to -network totals. Statistics include the amount of hidden-service traffic and the -number of hidden-service addresses in the network per day. For more details on +network totals. Statistics include the amount of onion-service traffic and the +number of onion-service addresses in the network per day. For more details on the extrapolation algorithm, see <a href="https://blog.torproject.org/blog/some-statistics-about-onions">this blog post</a> and <a @@ -419,11 +419,11 @@ technical report</a>.</p> <li><b>date:</b> UTC date (YYYY-MM-DD) when relays or bridges have been listed as running.</li> -<li><b>type:</b> Type of hidden-service statistic reported by relays and +<li><b>type:</b> Type of onion-service statistic reported by relays and extrapolated to network totals. Examples include <b>"rend-relayed-cells"</b> for the number of cells on rendezvous circuits observed by rendezvous points and <b>"dir-onions-seen"</b> for the number of unique .onion addresses observed by -hidden-service directories.</li> +onion-service directories.</li> <li><b>wmean:</b> Weighted mean of extrapolated network totals.</li>

1 0

[metrics-web/master] Fix anchors.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 30a727175b845e9db47923d31873b6c2b68ea93c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 5 13:42:56 2017 +0100 Fix anchors. --- website/web/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/web/css/style.css b/website/web/css/style.css index 1e54398..88cc2fa 100644 --- a/website/web/css/style.css +++ b/website/web/css/style.css @@ -768,11 +768,11 @@ label.checkbox-label, label.radio-label { /* Anchor-Links for Headlines */ .anchor { - display:none; + opacity:0; text-decoration:none; } *:hover > .anchor { - display:inline; + opacity:1; color:#78c040; } *:hover > .anchor:hover {

1 0

[metrics-web/master] Replace index.html links with /.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 5454ac1273bea6c0abae73635c81fcffeb67b67d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 6 10:06:09 2017 +0100 Replace index.html links with /. --- website/web/WEB-INF/about.jsp | 2 +- website/web/WEB-INF/bubbles.jsp | 2 +- website/web/WEB-INF/development.jsp | 2 +- website/web/WEB-INF/error.jsp | 4 ++-- website/web/WEB-INF/glossary.jsp | 2 +- website/web/WEB-INF/graph.jsp | 2 +- website/web/WEB-INF/link.jsp | 2 +- website/web/WEB-INF/news.jsp | 2 +- website/web/WEB-INF/operation.jsp | 2 +- website/web/WEB-INF/research.jsp | 2 +- website/web/WEB-INF/sources.jsp | 2 +- website/web/WEB-INF/stats.jsp | 2 +- website/web/WEB-INF/table.jsp | 2 +- website/web/WEB-INF/top.jsp | 10 +++++----- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp index 208b80f..b71135c 100644 --- a/website/web/WEB-INF/about.jsp +++ b/website/web/WEB-INF/about.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">About</li> </ul> </div> diff --git a/website/web/WEB-INF/bubbles.jsp b/website/web/WEB-INF/bubbles.jsp index 65260ba..55ae41a 100644 --- a/website/web/WEB-INF/bubbles.jsp +++ b/website/web/WEB-INF/bubbles.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">${categoryHeader}</li> </ul> </div> diff --git a/website/web/WEB-INF/development.jsp b/website/web/WEB-INF/development.jsp index 3c56345..b1192ae 100644 --- a/website/web/WEB-INF/development.jsp +++ b/website/web/WEB-INF/development.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">Development</li> </ul> </div> diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp index 6a55f8d..f4899a3 100644 --- a/website/web/WEB-INF/error.jsp +++ b/website/web/WEB-INF/error.jsp @@ -6,7 +6,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">${pageContext.errorData.statusCode}</li> </ul> </div> @@ -37,7 +37,7 @@ </b> when processing your request!</p> - <p>Maybe start over from the <a href="index.html">home page</a>.</p> + <p>Maybe start over from the <a href="/">home page</a>.</p> <p>If this problem persists, please <a href="about.html#contact">let us know</a>!</p> diff --git a/website/web/WEB-INF/glossary.jsp b/website/web/WEB-INF/glossary.jsp index 9bdba38..1c8b3ce 100644 --- a/website/web/WEB-INF/glossary.jsp +++ b/website/web/WEB-INF/glossary.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li><a href="about.html">About</a></li> <li class="active">Glossary</li> </ul> diff --git a/website/web/WEB-INF/graph.jsp b/website/web/WEB-INF/graph.jsp index d6ec70c..4be02bd 100644 --- a/website/web/WEB-INF/graph.jsp +++ b/website/web/WEB-INF/graph.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">${categoryHeader}</li> </ul> </div> diff --git a/website/web/WEB-INF/link.jsp b/website/web/WEB-INF/link.jsp index 8d307b4..acdf841 100644 --- a/website/web/WEB-INF/link.jsp +++ b/website/web/WEB-INF/link.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">${categoryHeader}</li> </ul> </div> diff --git a/website/web/WEB-INF/news.jsp b/website/web/WEB-INF/news.jsp index c5d86a0..68f1689 100644 --- a/website/web/WEB-INF/news.jsp +++ b/website/web/WEB-INF/news.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">News</li> </ul> </div> diff --git a/website/web/WEB-INF/operation.jsp b/website/web/WEB-INF/operation.jsp index 5ee2b77..d018df1 100644 --- a/website/web/WEB-INF/operation.jsp +++ b/website/web/WEB-INF/operation.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">Operation</li> </ul> </div> diff --git a/website/web/WEB-INF/research.jsp b/website/web/WEB-INF/research.jsp index 57438fc..80108cd 100644 --- a/website/web/WEB-INF/research.jsp +++ b/website/web/WEB-INF/research.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">Research</li> </ul> </div> diff --git a/website/web/WEB-INF/sources.jsp b/website/web/WEB-INF/sources.jsp index ff320bd..64ca85b 100644 --- a/website/web/WEB-INF/sources.jsp +++ b/website/web/WEB-INF/sources.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">Sources</li> </ul> </div> diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp index 9ad99fc..ccd60e0 100644 --- a/website/web/WEB-INF/stats.jsp +++ b/website/web/WEB-INF/stats.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li><a href="sources.html">Sources</a></li> <li class="active">Statistics</li> </ul> diff --git a/website/web/WEB-INF/table.jsp b/website/web/WEB-INF/table.jsp index a8e4dd5..cf26ab2 100644 --- a/website/web/WEB-INF/table.jsp +++ b/website/web/WEB-INF/table.jsp @@ -7,7 +7,7 @@ <div class="container"> <ul class="breadcrumb"> - <li><a href="index.html">Home</a></li> + <li><a href="/">Home</a></li> <li class="active">${categoryHeader}</li> </ul> </div> diff --git a/website/web/WEB-INF/top.jsp b/website/web/WEB-INF/top.jsp index 2d07351..c0428e2 100644 --- a/website/web/WEB-INF/top.jsp +++ b/website/web/WEB-INF/top.jsp @@ -65,7 +65,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c <span class="icon-bar"></span> <span class="icon-bar"></span> </label> - <a class="navbar-brand visible-xs" href="index.html"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics"></a> + <a class="navbar-brand visible-xs" href="/"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics"></a> </div>  @@ -74,7 +74,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c  <li class="visible-xs section-header">Metrics</li> - <li class="visible-xs<c:if test="${'Home'.equals(param.navActive)}"> active</c:if>"><a href="index.html"><i class="fa fa-home fa-fw" aria-hidden="true"></i> Home</a></li> + <li class="visible-xs<c:if test="${'Home'.equals(param.navActive)}"> active</c:if>"><a href="/"><i class="fa fa-home fa-fw" aria-hidden="true"></i> Home</a></li> <c:forEach var="category" items="${categories}"> <li class="visible-xs<c:if test="${category[1].equals(param.navActive)}"> active</c:if><c:if test="${fn:length(category[0]) == 0}"> disabled</c:if>"><a<c:if test="${fn:length(category[0]) > 0}"> href="${category[0]}.html"</c:if>><i class="fa ${category[3]} fa-fw" aria-hidden="true"></i> ${category[1]}</a></li> </c:forEach> @@ -98,8 +98,8 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c  <div class="page-header hidden-xs"> - <a href="index.html"><img src="images/metrics-logo.png" width="102" height="133" alt="" id="metrics-logo"></a> - <a href="index.html"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics" id="metrics-wordmark"></a> + <a href="/"><img src="images/metrics-logo.png" width="102" height="133" alt="" id="metrics-logo"></a> + <a href="/"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics" id="metrics-wordmark"></a> <div> <p> <i>“Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective.”<br><small>— Bruce Schneier (June 1, 2016)</small></i> @@ -114,7 +114,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c <div class="container-fluid"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-primary"> <ul class="nav navbar-nav"> - <li <c:if test="${'Home'.equals(param.navActive)}"> class="active"</c:if>><a href="index.html"><i class="fa fa-home fa-fw hidden-sm" aria-hidden="true"></i> Home</a></li> + <li <c:if test="${'Home'.equals(param.navActive)}"> class="active"</c:if>><a href="/"><i class="fa fa-home fa-fw hidden-sm" aria-hidden="true"></i> Home</a></li> <c:forEach var="category" items="${categories}"> <li class="<c:if test="${category[1].equals(param.navActive)}"> active</c:if><c:if test="${fn:length(category[0]) == 0}"> disabled</c:if>"><a<c:if test="${fn:length(category[0]) > 0}"> href="${category[0]}.html"</c:if>><i class="fa ${category[3]} fa-fw hidden-sm" aria-hidden="true"></i> ${category[1]}</a></li> </c:forEach>

1 0

[metrics-web/master] Update copyright.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit cb245fa3b5ba4722ab73d2a06a2a35259f3de66d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 6 10:43:39 2017 +0100 Update copyright. --- website/web/WEB-INF/bottom.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/web/WEB-INF/bottom.jsp b/website/web/WEB-INF/bottom.jsp index 0592228..1c02a8e 100644 --- a/website/web/WEB-INF/bottom.jsp +++ b/website/web/WEB-INF/bottom.jsp @@ -3,7 +3,7 @@ <div class="container no-gutter"> <div class="col-xs-6"> <p> - © 2009–2016 The Tor Project + © 2009–2017 The Tor Project </p> </div> <div class="col-xs-6">

1 0

[metrics-web/master] Add txtorcon to the development page.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 0a6320b68fe5ba0b1db6e49ac1c25aa343ad0210 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 6 09:43:05 2017 +0100 Add txtorcon to the development page. --- website/web/WEB-INF/development.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/website/web/WEB-INF/development.jsp b/website/web/WEB-INF/development.jsp index fe6fe0b..3c56345 100644 --- a/website/web/WEB-INF/development.jsp +++ b/website/web/WEB-INF/development.jsp @@ -23,6 +23,7 @@ <ul> <li><a href="https://dist.torproject.org/descriptor/" target="_blank">metrics-lib</a> is a Java library to fetch and parse Tor descriptors.</li> <li><a href="https://stem.torproject.org/" target="_blank">Stem</a> is a Python library that parses Tor descriptors.</li> + <li><a href="https://github.com/meejah/txtorcon" target="_blank">txtorcon</a> is an asynchronous Tor controller library written in Twisted Python.</li> <li><a href="https://github.com/NullHypothesis/zoossh" target="_blank">Zoossh</a> is a parser written in Go for Tor-specific data formats.</li> </ul> </div>

1 0

[metrics-web/master] Adapt the wording to the fact that graphs are above the description.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 0abf1ea2e43b94dc45c3a590c9668e6567f36622 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jan 9 15:07:27 2017 +0100 Adapt the wording to the fact that graphs are above the description. --- website/etc/metrics.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/website/etc/metrics.json b/website/etc/metrics.json index e8e7e85..1ba21a4 100644 --- a/website/etc/metrics.json +++ b/website/etc/metrics.json @@ -3,7 +3,7 @@ "id": "networksize", "title": "Relays and bridges", "type": "Graph", - "description": "<p>The following graph shows the number of running <a href=\"glossary.html#relay\">relays</a> and <a href=\"glossary.html#bridge\">bridges</a> in the network.</p>", + "description": "<p>This graph shows the number of running <a href=\"glossary.html#relay\">relays</a> and <a href=\"glossary.html#bridge\">bridges</a> in the network.</p>", "function": "plot_networksize", "parameters": [ "start", @@ -17,7 +17,7 @@ "id": "relayflags", "title": "Relays by relay flag", "type": "Graph", - "description": "<p>The following graph shows the number of running <a href=\"glossary.html#relay\">relays</a> that have had certain <a href=\"glossary.html#relay-flag\">flags</a> assigned by the <a href=\"glossary.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 onion service directory (\"HSDir\").</p>", + "description": "<p>This graph shows the number of running <a href=\"glossary.html#relay\">relays</a> that have had certain <a href=\"glossary.html#relay-flag\">flags</a> assigned by the <a href=\"glossary.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 onion service directory (\"HSDir\").</p>", "function": "plot_relayflags", "parameters": [ "start", @@ -32,7 +32,7 @@ "id": "versions", "title": "Relays by version", "type": "Graph", - "description": "<p>The following graph shows the number of running <a href=\"glossary.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/tree/ChangeLog\">changes file</a>.</p>", + "description": "<p>This graph shows the number of running <a href=\"glossary.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/tree/ChangeLog\">changes file</a>.</p>", "function": "plot_versions", "parameters": [ "start", @@ -46,7 +46,7 @@ "id": "platforms", "title": "Relays by platform", "type": "Graph", - "description": "<p>The following graph shows the number of running <a href=\"glossary.html#relay\">relays</a> by operating system. Relays report their operating system when they announce themselves in the network.</p>", + "description": "<p>This graph shows the number of running <a href=\"glossary.html#relay\">relays</a> by operating system. Relays report their operating system when they announce themselves in the network.</p>", "function": "plot_platforms", "parameters": [ "start", @@ -60,7 +60,7 @@ "id": "bandwidth", "title": "Total relay bandwidth", "type": "Graph", - "description": "<p>The following graph shows the total <a href=\"glossary.html#advertised-bandwidth\">advertised</a> and <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> of all <a href=\"glossary.html#relay\">relays</a> in the network.</p>", + "description": "<p>This graph shows the total <a href=\"glossary.html#advertised-bandwidth\">advertised</a> and <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> of all <a href=\"glossary.html#relay\">relays</a> in the network.</p>", "function": "plot_bandwidth", "parameters": [ "start", @@ -74,7 +74,7 @@ "id": "bwhist-flags", "title": "Consumed bandwidth by Exit/Guard flag combination", "type": "Graph", - "description": "<p>The following graph shows the <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> reported by relays, subdivided into four distinct subsets by assigned \"Exit\" and/or \"Guard\" <a href=\"glossary.html#relay-flag\">flags</a>.</p>", + "description": "<p>This graph shows the <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> reported by relays, subdivided into four distinct subsets by assigned \"Exit\" and/or \"Guard\" <a href=\"glossary.html#relay-flag\">flags</a>.</p>", "function": "plot_bwhist_flags", "parameters": [ "start", @@ -88,7 +88,7 @@ "id": "bandwidth-flags", "title": "Advertised and consumed bandwidth by relay flag", "type": "Graph", - "description": "<p>The following graph shows <a href=\"glossary.html#advertised-bandwidth\">advertised</a> and <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> of relays with either \"Exit\" or \"Guard\" <a href=\"glossary.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>", + "description": "<p>This graph shows <a href=\"glossary.html#advertised-bandwidth\">advertised</a> and <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> of relays with either \"Exit\" or \"Guard\" <a href=\"glossary.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>", "function": "plot_bandwidth_flags", "parameters": [ "start", @@ -102,7 +102,7 @@ "id": "dirbytes", "title": "Bandwidth spent on answering directory requests", "type": "Graph", - "description": "<p>The following graph shows the portion of <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> that <a href=\"glossary.html#directory-authority\">directory authorities</a> and <a href=\"glossary.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>", + "description": "<p>This graph shows the portion of <a href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> that <a href=\"glossary.html#directory-authority\">directory authorities</a> and <a href=\"glossary.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>", "function": "plot_dirbytes", "parameters": [ "start", @@ -116,7 +116,7 @@ "id": "advbwdist-perc", "title": "Advertised bandwidth distribution", "type": "Graph", - "description": "<p>The following graph shows the distribution of the <a href=\"glossary.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>", + "description": "<p>This graph shows the distribution of the <a href=\"glossary.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>", "function": "plot_advbwdist_perc", "parameters": [ "start", @@ -131,7 +131,7 @@ "id": "advbwdist-relay", "title": "Advertised bandwidth of n-th fastest relays", "type": "Graph", - "description": "<p>The following graph shows the <a href=\"glossary.html#advertised-bandwidth\">advertised bandwidth</a> of the n-th fastest relays in the network for different values of n.</p>", + "description": "<p>This graph shows the <a href=\"glossary.html#advertised-bandwidth\">advertised bandwidth</a> of the n-th fastest relays in the network for different values of n.</p>", "function": "plot_advbwdist_relay", "parameters": [ "start", @@ -151,7 +151,7 @@ "id": "userstats-relay-country", "title": "Relay users", "type": "Graph", - "description": "<p>The following graph shows the estimated number of directly-connecting <a href=\"glossary.html#client\">clients</a>; that is, it excludes clients connecting via <a href=\"glossary.html#bridge\">bridges</a>. These estimates are derived from the number of directory requests counted on <a href=\"glossary.html#directory-authority\">directory authorities</a> and <a href=\"glossary.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>). For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", + "description": "<p>This graph shows the estimated number of directly-connecting <a href=\"glossary.html#client\">clients</a>; that is, it excludes clients connecting via <a href=\"glossary.html#bridge\">bridges</a>. These estimates are derived from the number of directory requests counted on <a href=\"glossary.html#directory-authority\">directory authorities</a> and <a href=\"glossary.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>). For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", "function": "plot_userstats_relay_country", "parameters": [ "start", @@ -213,7 +213,7 @@ "id": "userstats-bridge-country", "title": "Bridge users by country", "type": "Graph", - "description": "<p>The following graph shows the estimated number of <a href=\"glossary.html#client\">clients</a> connecting via <a href=\"glossary.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. For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", + "description": "<p>This graph shows the estimated number of <a href=\"glossary.html#client\">clients</a> connecting via <a href=\"glossary.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. For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", "function": "plot_userstats_bridge_country", "parameters": [ "start", @@ -250,7 +250,7 @@ "id": "userstats-bridge-transport", "title": "Bridge users by transport", "type": "Graph", - "description": "<p>The following graph shows the estimated number of <a href=\"glossary.html#client\">clients</a> connecting via <a href=\"glossary.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=\"glossary.html#pluggable-transport\">pluggable transports</a>, so that graphs are available for different transports. For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", + "description": "<p>This graph shows the estimated number of <a href=\"glossary.html#client\">clients</a> connecting via <a href=\"glossary.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=\"glossary.html#pluggable-transport\">pluggable transports</a>, so that graphs are available for different transports. For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", "function": "plot_userstats_bridge_transport", "parameters": [ "start", @@ -265,7 +265,7 @@ "id": "userstats-bridge-combined", "title": "Bridge users by country and transport", "type": "Graph", - "description": "<p>The following graph shows the estimated number of <a href=\"glossary.html#client\">clients</a> connecting via <a href=\"glossary.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, and they distinguish connecting clients by transport protocol, which may include <a href=\"glossary.html#pluggable-transport\">pluggable transports</a>. Even though bridges don't report a combination of clients by country and transport, it's possible to derive and graph lower and upper bounds from existing usage statistics. For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", + "description": "<p>This graph shows the estimated number of <a href=\"glossary.html#client\">clients</a> connecting via <a href=\"glossary.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, and they distinguish connecting clients by transport protocol, which may include <a href=\"glossary.html#pluggable-transport\">pluggable transports</a>. Even though bridges don't report a combination of clients by country and transport, it's possible to derive and graph lower and upper bounds from existing usage statistics. For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", "function": "plot_userstats_bridge_combined", "parameters": [ "start", @@ -280,7 +280,7 @@ "id": "userstats-bridge-version", "title": "Bridge users by IP version", "type": "Graph", - "description": "<p>The following graph shows the estimated number of <a href=\"glossary.html#client\">clients</a> connecting via <a href=\"glossary.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. For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", + "description": "<p>This graph shows the estimated number of <a href=\"glossary.html#client\">clients</a> connecting via <a href=\"glossary.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. For further details see these <a href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\">questions and answers about user statistics</a>.</p>", "function": "plot_userstats_bridge_version", "parameters": [ "start", @@ -301,7 +301,7 @@ "id": "torperf", "title": "Time to download files over Tor", "type": "Graph", - "description": "<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>", + "description": "<p>This 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>", "function": "plot_torperf", "parameters": [ "start", @@ -317,7 +317,7 @@ "id": "torperf-failures", "title": "Timeouts and failures of downloading files over Tor", "type": "Graph", - "description": "<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 expected.</p>", + "description": "<p>This 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 expected.</p>", "function": "plot_torperf_failures", "parameters": [ "start", @@ -333,7 +333,7 @@ "id": "connbidirect", "title": "Fraction of connections used uni-/bidirectionally", "type": "Graph", - "description": "<p>The following graph shows the fraction of direct connections between a <a href=\"glossary.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>", + "description": "<p>This graph shows the fraction of direct connections between a <a href=\"glossary.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>", "function": "plot_connbidirect", "parameters": [ "start", @@ -347,7 +347,7 @@ "id": "hidserv-dir-onions-seen", "title": "Unique .onion addresses", "type": "Graph", - "description": "<p>The following graph shows the number of unique .onion addresses in the network per day. These numbers are extrapolated from aggregated statistics on unique .onion addresses reported by single <a href=\"glossary.html#relay\">relays</a> acting as <a href=\"glossary.html#onion-service\">onion-service</a> directories, if at least 1% of relays reported these statistics. For more details on the extrapolation algorithm, see <a href=\"https://blog.torproject.org/blog/some-statistics-about-onions\">this blog post</a> and <a href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-201…">this technical report</a>.</p>", + "description": "<p>This graph shows the number of unique .onion addresses in the network per day. These numbers are extrapolated from aggregated statistics on unique .onion addresses reported by single <a href=\"glossary.html#relay\">relays</a> acting as <a href=\"glossary.html#onion-service\">onion-service</a> directories, if at least 1% of relays reported these statistics. For more details on the extrapolation algorithm, see <a href=\"https://blog.torproject.org/blog/some-statistics-about-onions\">this blog post</a> and <a href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-201…">this technical report</a>.</p>", "function": "plot_hidserv_dir_onions_seen", "parameters": [ "start", @@ -361,7 +361,7 @@ "id": "hidserv-rend-relayed-cells", "title": "Onion-service traffic", "type": "Graph", - "description": "<p>The following graph shows the amount of onion-service traffic in the network per day. This number is extrapolated from aggregated statistics on onion-service traffic reported by single <a href=\"glossary.html#relay\">relays</a> acting as rendezvous points for <a href=\"glossary.html#onion-service\">onion services</a>, if at least 1% of relays reported these statistics. For more details on the extrapolation algorithm, see <a href=\"https://blog.torproject.org/blog/some-statistics-about-onions\">this blog post</a> and <a href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-201…">this technical report</a>.</p>", + "description": "<p>This graph shows the amount of onion-service traffic in the network per day. This number is extrapolated from aggregated statistics on onion-service traffic reported by single <a href=\"glossary.html#relay\">relays</a> acting as rendezvous points for <a href=\"glossary.html#onion-service\">onion services</a>, if at least 1% of relays reported these statistics. For more details on the extrapolation algorithm, see <a href=\"https://blog.torproject.org/blog/some-statistics-about-onions\">this blog post</a> and <a href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-201…">this technical report</a>.</p>", "function": "plot_hidserv_rend_relayed_cells", "parameters": [ "start", @@ -375,7 +375,7 @@ "id": "hidserv-frac-reporting", "title": "Fraction of relays reporting onion-service statistics", "type": "Graph", - "description": "<p>The following graph shows the fraction of <a href=\"glossary.html#relay\">relays</a> that report statistics on <a href=\"glossary.html#onion-service\">onion service</a> usage. If at least 1% of relays report a statistic, it gets extrapolated towards a network total, where higher fractions are produce more accurate results. For more details on the extrapolation algorithm, see <a href=\"https://blog.torproject.org/blog/some-statistics-about-onions\">this blog post</a> and <a href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-201…">this technical report</a>.</p>", + "description": "<p>This graph shows the fraction of <a href=\"glossary.html#relay\">relays</a> that report statistics on <a href=\"glossary.html#onion-service\">onion service</a> usage. If at least 1% of relays report a statistic, it gets extrapolated towards a network total, where higher fractions are produce more accurate results. For more details on the extrapolation algorithm, see <a href=\"https://blog.torproject.org/blog/some-statistics-about-onions\">this blog post</a> and <a href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-201…">this technical report</a>.</p>", "function": "plot_hidserv_frac_reporting", "parameters": [ "start",

1 0