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

[metrics-web/master] Apply new design to operation and development pages.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit a6b8d8d6f4909d51cc171cd48c1925ef15909f5b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 21 14:02:00 2016 +0100 Apply new design to operation and development pages. --- website/etc/web.xml | 26 ++-- .../torproject/metrics/web/DevelopmentServlet.java | 31 +++++ .../torproject/metrics/web/OperationServlet.java | 31 +++++ .../org/torproject/metrics/web/ToolsServlet.java | 26 ---- website/web/WEB-INF/development.jsp | 39 ++++++ website/web/WEB-INF/operation.jsp | 33 +++++ website/web/WEB-INF/research.jsp | 8 ++ website/web/WEB-INF/tools.jsp | 136 --------------------- 8 files changed, 160 insertions(+), 170 deletions(-) diff --git a/website/etc/web.xml b/website/etc/web.xml index b6f2015..7436906 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -213,26 +213,36 @@ </servlet-mapping> <servlet> - <servlet-name>ToolsServlet</servlet-name> + <servlet-name>StatsServlet</servlet-name> <servlet-class> - org.torproject.metrics.web.ToolsServlet + org.torproject.metrics.web.StatsServlet </servlet-class> </servlet> <servlet-mapping> - <servlet-name>ToolsServlet</servlet-name> + <servlet-name>StatsServlet</servlet-name> + <url-pattern>/stats.html</url-pattern> + </servlet-mapping> + + <servlet> + <servlet-name>OperationServlet</servlet-name> + <servlet-class> + org.torproject.metrics.web.OperationServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>OperationServlet</servlet-name> <url-pattern>/operation.html</url-pattern> - <url-pattern>/development.html</url-pattern> </servlet-mapping> <servlet> - <servlet-name>StatsServlet</servlet-name> + <servlet-name>DevelopmentServlet</servlet-name> <servlet-class> - org.torproject.metrics.web.StatsServlet + org.torproject.metrics.web.DevelopmentServlet </servlet-class> </servlet> <servlet-mapping> - <servlet-name>StatsServlet</servlet-name> - <url-pattern>/stats.html</url-pattern> + <servlet-name>DevelopmentServlet</servlet-name> + <url-pattern>/development.html</url-pattern> </servlet-mapping> <servlet> diff --git a/website/src/org/torproject/metrics/web/DevelopmentServlet.java b/website/src/org/torproject/metrics/web/DevelopmentServlet.java new file mode 100644 index 0000000..bd09cd9 --- /dev/null +++ b/website/src/org/torproject/metrics/web/DevelopmentServlet.java @@ -0,0 +1,31 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.web; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class DevelopmentServlet extends AnyServlet { + + private static final long serialVersionUID = 6850919895248020945L; + + @Override + public void init() throws ServletException { + super.init(); + } + + @Override + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + + /* Forward the request to the JSP that does all the hard work. */ + request.setAttribute("categories", this.categories); + request.getRequestDispatcher("WEB-INF/development.jsp").forward(request, + response); + } +} + diff --git a/website/src/org/torproject/metrics/web/OperationServlet.java b/website/src/org/torproject/metrics/web/OperationServlet.java new file mode 100644 index 0000000..029383d --- /dev/null +++ b/website/src/org/torproject/metrics/web/OperationServlet.java @@ -0,0 +1,31 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.web; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class OperationServlet extends AnyServlet { + + private static final long serialVersionUID = 6850919895248020945L; + + @Override + public void init() throws ServletException { + super.init(); + } + + @Override + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + + /* Forward the request to the JSP that does all the hard work. */ + request.setAttribute("categories", this.categories); + request.getRequestDispatcher("WEB-INF/operation.jsp").forward(request, + response); + } +} + diff --git a/website/src/org/torproject/metrics/web/ToolsServlet.java b/website/src/org/torproject/metrics/web/ToolsServlet.java deleted file mode 100644 index d538512..0000000 --- a/website/src/org/torproject/metrics/web/ToolsServlet.java +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2016 The Tor Project - * See LICENSE for licensing information */ - -package org.torproject.metrics.web; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class ToolsServlet extends HttpServlet { - - private static final long serialVersionUID = -7868806710366794044L; - - @Override - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - - /* Forward the request to the JSP that does all the hard work. */ - request.getRequestDispatcher("WEB-INF/tools.jsp").forward(request, - response); - } -} - diff --git a/website/web/WEB-INF/development.jsp b/website/web/WEB-INF/development.jsp new file mode 100644 index 0000000..183df9c --- /dev/null +++ b/website/web/WEB-INF/development.jsp @@ -0,0 +1,39 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<jsp:include page="top.jsp"> + <jsp:param name="pageTitle" value="Development – Tor Metrics"/> + <jsp:param name="navActive" value="Development"/> +</jsp:include> + + <div class="container"> + <ul class="breadcrumb"> + <li><a href="index.html">Home</a></li> + <li class="active">Development</li> + </ul> + </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> + </div> + +<jsp:include page="bottom.jsp"/> + diff --git a/website/web/WEB-INF/operation.jsp b/website/web/WEB-INF/operation.jsp new file mode 100644 index 0000000..8888183 --- /dev/null +++ b/website/web/WEB-INF/operation.jsp @@ -0,0 +1,33 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<jsp:include page="top.jsp"> + <jsp:param name="pageTitle" value="Operation – Tor Metrics"/> + <jsp:param name="navActive" value="Operation"/> +</jsp:include> + + <div class="container"> + <ul class="breadcrumb"> + <li><a href="index.html">Home</a></li> + <li class="active">Operation</li> + </ul> + </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> + </div> + +<jsp:include page="bottom.jsp"/> + diff --git a/website/web/WEB-INF/research.jsp b/website/web/WEB-INF/research.jsp index 3ec2e21..d58cff3 100644 --- a/website/web/WEB-INF/research.jsp +++ b/website/web/WEB-INF/research.jsp @@ -58,5 +58,13 @@ </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> + </div> + <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/tools.jsp b/website/web/WEB-INF/tools.jsp deleted file mode 100644 index b68d6ba..0000000 --- a/website/web/WEB-INF/tools.jsp +++ /dev/null @@ -1,136 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <title>Tor Metrics</title> - <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> - <link href="css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> - <link href="css/bootstrap.min.css" type="text/css" rel="stylesheet"> - <link href="images/favicon.ico" type="image/x-icon" rel="shortcut icon"> -</head> -<body> - <div class="center"> - <div class="main-column"> - <h2><a href="/"><img src="images/metrics-logo.png" width="153" height="200" alt="Metrics logo"><img src="images/metrics-wordmark.png" width="384" height="50" alt="Metrics wordmark"></a></h2> - <br> - -<p>"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." -<i>- Bruce Schneier (June 1, 2016)</i></p> - -  - <a href="index.html">Metrics</a> | - <a href="about.html">About</a> | - <a href="news.html">News</a> | - Tools | - <a href="research.html">Research</a> - <br> - <br> -  - -<h1>Tools</h1> -<br> - -<p>We list some tools that you can use to collect data about Tor. We don't use -all of the tools listed here. We use CollecTor to collect (relay data, bridge -data, etc), OONI to collect (data, data, data), and Onionoo to collect (data, -data, data).</p> - -<p>With these other tools, you can measure different things about Tor that we -currently do not! We encourage you to do so if you are curious, want check up on -your relays, or conduct some research.</p> - -<h2>Our sources</h2> - -<ul> -<li><a href="https://collector.torproject.org/">CollecTor</a> collects data from -various nodes and services in the public Tor network.</li> -<li><a href="https://ooni.torproject.org/">OONI</a>, detects censorship, -surveillance and traffic manipulation on the internet.</li> -<li><a href="https://onionoo.torproject.org/">Onionoo</a> provides current and -past data on relays and bridges to other services.</li> -</ul> - -<h2>Others</h2> - -<ul> -<li><a href="https://gitweb.torproject.org/user/phw/exitmap.git">Exitmap</a> is -a fast and extensible scanner for Tor exit relays.</li> -<li><a href="https://github.com/robgjansen/onionperf">OnionPerf</a> measures the -performance of onion services.</li> -<li><a href="https://gitweb.torproject.org/torperf.git">Torperf</a> measures Tor -performance with a set of utilities and Python scripts.</li> -<li><a href="https://www.torproject.org/projects/tordnsel.html.en">TorDNSEL</a> -publishes lists of IP addresses of multi-homed Tor exits.</li> -<li><a -href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">Sybilhunter</a> -attempts to detect Sybil attacks on the Tor network.</li> -<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://torps.github.io/">TorPS</a> simulates changes to Tor's path -selection algorithm using archived data.</li> -<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><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://onionview.codeplex.com/">OnionView</a> plots the location -of active Tor nodes on an interactive map of the world.</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="https://shadow.github.io/">Shadow</a> uses archived Tor directory -data to generate realistic network topologies.</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>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> -</ul> - -<h2>Things we took out for now</h2> - -<ul> -<li><a href="http://tor2web.org/">Tor2web</a> is a web proxy for Tor Hidden -Services.</li> -<li><a href="https://tor-explorer-10kapart2016.azurewebsites.net/">Tor -Explorer</a> displays data on each individual Tor node.</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://github.com/kloesing/challenger">challenger</a> aggregates -data from relays participating in EFF's 2014 Tor Challenge.</li> -<li>A <a href="https://duckduckgo.com/">DuckDuckGo</a> search with "tor node" -keywords displays Tor node details.</li> -<li><a -href="https://metrics.torproject.org/uncharted-data-flow.html">metrics-lib</a> -is a Java library to fetch and parse 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 Twisted 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 querying Onionoo data.</li> -</ul> - - </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> -

1 0

[metrics-web/master] Apply new design to error pages.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit e60c138ed920cf60be509d10acf1bcafbd13b231 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 21 14:11:21 2016 +0100 Apply new design to error pages. --- website/etc/web.xml | 19 ++++- .../org/torproject/metrics/web/ErrorServlet.java | 31 ++++++++ website/web/WEB-INF/error.jsp | 92 +++++++++++----------- website/web/WEB-INF/footer.jsp | 13 --- 4 files changed, 90 insertions(+), 65 deletions(-) diff --git a/website/etc/web.xml b/website/etc/web.xml index 7436906..6df2aa0 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -260,21 +260,32 @@ <welcome-file>index.html</welcome-file> </welcome-file-list> + <servlet> + <servlet-name>ErrorServlet</servlet-name> + <servlet-class> + org.torproject.metrics.web.ErrorServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ErrorServlet</servlet-name> + <url-pattern>/error.html</url-pattern> + </servlet-mapping> + <error-page> <error-code>400</error-code> - <location>/WEB-INF/error.jsp</location> + <location>/error.html</location> </error-page> <error-page> <error-code>404</error-code> - <location>/WEB-INF/error.jsp</location> + <location>/error.html</location> </error-page> <error-page> <error-code>500</error-code> - <location>/WEB-INF/error.jsp</location> + <location>/error.html</location> </error-page> <error-page> <exception-type>java.lang.Throwable</exception-type> - <location>/WEB-INF/error.jsp</location> + <location>/error.html</location> </error-page> <context-param> diff --git a/website/src/org/torproject/metrics/web/ErrorServlet.java b/website/src/org/torproject/metrics/web/ErrorServlet.java new file mode 100644 index 0000000..1e682ec --- /dev/null +++ b/website/src/org/torproject/metrics/web/ErrorServlet.java @@ -0,0 +1,31 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.web; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class ErrorServlet extends AnyServlet { + + private static final long serialVersionUID = 6850919895248020945L; + + @Override + public void init() throws ServletException { + super.init(); + } + + @Override + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + + /* Forward the request to the JSP that does all the hard work. */ + request.setAttribute("categories", this.categories); + request.getRequestDispatcher("WEB-INF/error.jsp").forward(request, + response); + } +} + diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp index 0574606..6a55f8d 100644 --- a/website/web/WEB-INF/error.jsp +++ b/website/web/WEB-INF/error.jsp @@ -1,51 +1,47 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ page isErrorPage="true" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <title>Tor Metrics — Error</title> - <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> - <link href="css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> - <link href="css/bootstrap.min.css" type="text/css" rel="stylesheet"> - <link href="images/favicon.ico" type="image/x-icon" rel="shortcut icon"> -</head> -<body> - <div class="center"> - <div class="main-column"> -<h2><a href="/"><img src="images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Error</h2> -<br> -<p> -Oops! Something went wrong here! We encountered a -<b> -<c:choose> -<c:when test="${pageContext.errorData.statusCode eq 400}"> -400 Bad Request -</c:when> -<c:when test="${pageContext.errorData.statusCode eq 404}"> -404 Not Found -</c:when> -<c:when test="${pageContext.errorData.statusCode eq 500}"> -500 Internal Server Error -</c:when> -<c:when test="${not empty pageContext.errorData.throwable}"> -${pageContext.exception} -</c:when> -<c:otherwise> -Unknown Error -</c:otherwise> -</c:choose> -</b> -when processing your request!</p> - -<p>Maybe start over from the <a href="/">home page</a>.</p> - -<p>If this problem persists, please -<a href="https://www.torproject.org/about/contact">let us know</a>!</p> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<jsp:include page="top.jsp"> + <jsp:param name="pageTitle" value="${pageContext.errorData.statusCode} – Tor Metrics"/> +</jsp:include> + <div class="container"> + <ul class="breadcrumb"> + <li><a href="index.html">Home</a></li> + <li class="active">${pageContext.errorData.statusCode}</li> + </ul> </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> + + <div class="container"> + <h1>Error</h1> + + <p> + Oops! Something went wrong here! We encountered a + <b> + <c:choose> + <c:when test="${pageContext.errorData.statusCode eq 400}"> + 400 Bad Request + </c:when> + <c:when test="${pageContext.errorData.statusCode eq 404}"> + 404 Not Found + </c:when> + <c:when test="${pageContext.errorData.statusCode eq 500}"> + 500 Internal Server Error + </c:when> + <c:when test="${not empty pageContext.errorData.throwable}"> + ${pageContext.exception} + </c:when> + <c:otherwise> + Unknown Error + </c:otherwise> + </c:choose> + </b> + when processing your request!</p> + + <p>Maybe start over from the <a href="index.html">home page</a>.</p> + + <p>If this problem persists, please <a href="about.html#contact">let us know</a>!</p> + + </div> + +<jsp:include page="bottom.jsp"/> + diff --git a/website/web/WEB-INF/footer.jsp b/website/web/WEB-INF/footer.jsp deleted file mode 100644 index cab9e7f..0000000 --- a/website/web/WEB-INF/footer.jsp +++ /dev/null @@ -1,13 +0,0 @@ - <p>This material is supported in part by the National Science - Foundation under Grant No. CNS-0959138. Any opinions, - finding, and conclusions or recommendations expressed in this - material are those of the author(s) and do not necessarily reflect - the views of the National Science Foundation.</p> - <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/docs/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p> - <p>Data on this site is freely available under a - <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 no - copyright declaration</a>: To the extent possible under law, the Tor - Project has waived all copyright and related or neighboring rights - in the data. Graphs are licensed under a - <a href="http://creativecommons.org/licenses/by/3.0/us/">Creative - Commons Attribution 3.0 United States License</a>.</p>

1 0

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

09 Jan '17

commit 56fe12449ab088dcbd724eb1da29daa7baabe7c9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 21 14:13:26 2016 +0100 Fix two contact links. --- website/web/WEB-INF/bottom.jsp | 2 +- website/web/WEB-INF/index.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/web/WEB-INF/bottom.jsp b/website/web/WEB-INF/bottom.jsp index 5549cc8..0592228 100644 --- a/website/web/WEB-INF/bottom.jsp +++ b/website/web/WEB-INF/bottom.jsp @@ -9,7 +9,7 @@ <div class="col-xs-6"> <p class="pull-right"> - <a href="?page=about#contact">Contact</a> + <a href="about.html#contact">Contact</a> </p> </div> diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp index e55b389..c6535fb 100644 --- a/website/web/WEB-INF/index.jsp +++ b/website/web/WEB-INF/index.jsp @@ -30,7 +30,7 @@ </div> <div class="container"> - <p><a href="?page=about&sub=contact" target="_blank">Let us know</a> if we're missing anything, or if we should measure something else.</p> + <p><a href="about.html#contact">Let us know</a> if we're missing anything, or if we should measure something else.</p> </div> <jsp:include page="bottom.jsp"/>

1 0

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

09 Jan '17

commit 0ca8b5845304994092657364441f703ec0033974 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 22 20:45:30 2016 +0100 Update news. --- website/etc/news.json | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/website/etc/news.json b/website/etc/news.json index 8661afe..3e2bb21 100644 --- a/website/etc/news.json +++ b/website/etc/news.json @@ -237,6 +237,14 @@ }, { "start": "2016-10-08", + "place": "et", + "description": "Ethiopia declares a state of emergency and implements network blocks.", + "links": [ + "<a href=\"https://ooni.torproject.org/post/ethiopia-report/#internet-shutdown\">OONI report</a>" + ] + }, + { + "start": "2016-10-08", "end": "2016-10-09", "place": "tr", "description": "Turkey blocks storage services including Dropbox, Google Drive, OneDrive, and GitHub. Most (all?) of the blocks were rescinded the next day.", @@ -286,7 +294,8 @@ "description": "Turkey orders a block on VPN services and Tor", "links": [ "<a href=\"http://turk-internet.com/portal/yazigoster.php?yaziid=54465\">Turkish article</a>", - "<a href=\"https://motherboard.vice.com/read/turkey-doubles-down-on-censorship-with-bl…">English article</a>" + "<a href=\"https://motherboard.vice.com/read/turkey-doubles-down-on-censorship-with-bl…">English article</a>", + "<a href=\"https://bugs.torproject.org/21014\">ticket</a>" ] }, { @@ -345,6 +354,29 @@ ] }, { + "start": "2016-12-12", + "place": "tr", + "protocols": [ + "<OR>" + ], + "description": "Turkey blocks direct Tor connections. The order to block had come on 2016-11-04.", + "links": [ + "<a href=\"https://bugs.torproject.org/21014\">ticket</a>", + "<a href=\"https://twitter.com/josswright/status/809379534420185089\">tweet</a>", + "<a href=\"https://turkeyblocks.org/2016/12/18/tor-blocked-in-turkey-vpn-ban/\">article</a>" + ] + }, + { + "start": "2016-12-15", + "place": "cd", + "description": "The Democratic Republic of the Congo orders a block of social media services.", + "links": [ + "<a href=\"http://wlrn.org/post/congo-block-social-media-sites-ahead-protests-against-…">article</a>", + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2016-10-0…">relay graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-bridge-country.html?start=2016-10-…">bridge graph</a>" + ] + }, + { "start": "2016-02-24", "place": "tm", "protocols": [

1 0

[metrics-web/master] Add blank line after each news entry.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 2e8ed2fe135782027bfb9baf3d36259e3752a99b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 22 12:04:39 2016 +0100 Add blank line after each news entry. --- website/web/WEB-INF/news.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/website/web/WEB-INF/news.jsp b/website/web/WEB-INF/news.jsp index 61c4e24..85ea881 100644 --- a/website/web/WEB-INF/news.jsp +++ b/website/web/WEB-INF/news.jsp @@ -24,6 +24,7 @@ <h2>${category.key[0]}</h2> <c:forEach var="entry" items="${category.value}"> <p>${entry[0]}</p> + <br> </c:forEach> </c:forEach>

1 0

[metrics-web/master] Add section headers to mobile navbar.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit ac7aec6d66a6e66dfed3bc0e75479a19c0196652 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 22 20:11:09 2016 +0100 Add section headers to mobile navbar. --- website/web/WEB-INF/top.jsp | 2 ++ website/web/css/style.css | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/website/web/WEB-INF/top.jsp b/website/web/WEB-INF/top.jsp index c0d70c2..7074eb7 100644 --- a/website/web/WEB-INF/top.jsp +++ b/website/web/WEB-INF/top.jsp @@ -73,6 +73,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c <ul class="nav navbar-nav navbar-right">  + <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> <c:forEach var="category" items="${categories}"> <li class="visible-xs<c:if test="${category[1].equals(param.navActive)}"> active</c:if>"><a href="${category[0]}.html"><i class="fa ${category[3]} fa-fw" aria-hidden="true"></i> ${category[1]}</a></li> @@ -80,6 +81,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c   + <li class="visible-xs section-header">More</li> <li <c:if test="${'News'.equals(param.navActive)}"> class="active"</c:if>><a href="news.html"><i class="fa fa-newspaper-o fa-fw hidden-sm" aria-hidden="true"></i> News</a></li> <li <c:if test="${'Sources'.equals(param.navActive)}"> class="active"</c:if>><a href="sources.html"><i class="fa fa-archive fa-fw hidden-sm" aria-hidden="true"></i> Sources</a></li> <li <c:if test="${'Operation'.equals(param.navActive)}"> class="active"</c:if>><a href="operation.html"><i class="fa fa-cogs fa-fw hidden-sm" aria-hidden="true"></i> Operation</a></li> diff --git a/website/web/css/style.css b/website/web/css/style.css index 6191917..891ea53 100644 --- a/website/web/css/style.css +++ b/website/web/css/style.css @@ -154,6 +154,18 @@ body { } } +.navbar-secondary .section-header { + padding:3px 14px; + text-transform:uppercase; + font-size:12px; + background-color: #aaa; + color:white; + margin-top:20px; +} +.navbar-secondary .section-header:first-of-type { + margin-top:0px; +} + /* images */ img {

1 0

[metrics-web/master] Remove now unused stylesheet.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit c14c5203b8eeeaa05ca3fe398ddc6243290c65a7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 21 17:51:28 2016 +0100 Remove now unused stylesheet. --- website/web/css/stylesheet-ltr.css | 170 ------------------------------------- 1 file changed, 170 deletions(-) diff --git a/website/web/css/stylesheet-ltr.css b/website/web/css/stylesheet-ltr.css deleted file mode 100644 index 68e513f..0000000 --- a/website/web/css/stylesheet-ltr.css +++ /dev/null @@ -1,170 +0,0 @@ -body { - background-color: white; - margin-top: 0px; - font-family: Arial, Helvetica, sans-serif; - font-size: 1em; - font-style: normal; - color: #000000; - padding-top: 0px; -} - -/* images */ - -img { - border: 0; -} - - -li { - margin: .2em .2em .2em 1em; -} - -/* this centers the page */ - -.center { - text-align: center; - background-color: white; - margin: 0px auto 0 auto; - width: 85%; -} - -.center table { - margin-left: auto; - margin-right: auto; - text-align: left; -} - -div.bottom { - font-size: 0.8em; - margin-top: 0.5cm; - margin-left: 1em; - margin-right: 1em; - text-align: center; -} - -/* The main column (left text) */ - -div.main-column { - padding: 15px 0 10px 10px; - text-indent: 0pt; - font-size: 1em; - direction: ltr; - text-align: left; -} - -/* formatting styles */ - -h2 { - font-size: 1.4em; - margin-bottom: 0em; - font-weight: bold; - margin-top: 0; -} - -h3 { - font-size: 1.2em; - margin-bottom: 0em; - font-weight: bold; - margin-top: 0; -} - -p { - margin-top: 0; - margin-bottom: 1em; -} - -a:link { - color: blue; - font-size: 1em; -} - -a:visited { - color: purple; - font-size: 1em; -} - -a.anchor { - font-size: 1em; - color: black; - font-weight: bold; - text-decoration: none; -} - -td { - vertical-align: top; -} - -/* the banner */ - -table.banner { - width: 100%; - height: 79px; - margin-left: auto; - margin-right: auto; -} - -td.banner-left { - /* This is done with an <img> in the HTML so it can be clickable - background-image: url("images/top-left.png"); - background-repeat: no-repeat; */ - width: 193px; -} - -td.banner-middle { - background-color: #00802B; - background-image: url("/images/top-middle.png"); - background-repeat: repeat-x; - vertical-align: bottom; - padding-bottom: 10px; - color: white; - font-weight: bold; - font-size: 1.2em; -} - -td.banner-middle a, td.banner-middle a:visited { - margin-right: 5px; - color: white; - font-weight: bold; - font-size: 1em; -} - -td.banner-middle a:hover { - color: #FF7F00; - font-weight: bold; - font-size: 1em; -} - -td.banner-right { - background-image: url("/images/top-right.png"); - background-repeat: no-repeat; - width: 15px; - background-position: right; - padding-top: 8px; -} - -.banner-middle a.current { - text-decoration: none; - color: #FF7F00; - font-weight: bold; - font-size: 1em; - width: auto; - left: -50px; -} - -hr { - background-color:#002200; - color:#666666; - font-size:1px; - height:1px; - line-height:0; - margin:15px 0 5px; -} - -label.checkbox-label { - white-space: nowrap; -} - -label.radio-label { - white-space: nowrap; -} -

1 0

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

09 Jan '17

commit 2d886563ebc6a9100bfca088297413df7ae94b13 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 22 21:28:06 2016 +0100 Style forms a bit more. --- website/web/WEB-INF/graph.jsp | 64 +++++++++++++++++++++++-------------------- website/web/WEB-INF/table.jsp | 10 +++---- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/website/web/WEB-INF/graph.jsp b/website/web/WEB-INF/graph.jsp index d6f69bf..564b563 100644 --- a/website/web/WEB-INF/graph.jsp +++ b/website/web/WEB-INF/graph.jsp @@ -72,54 +72,60 @@ </p> </c:if> <c:if test="${fn:length(flag) > 0}"> - <p>Relay flags: - <c:forEach var="row" items="${flag}"> - <label class="checkbox-label"> - <input type="checkbox" name="flag" value="${row[0]}"${row[1]}> ${row[0]} - </label> - </c:forEach> + <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> </p> </c:if> <c:if test="${fn:length(country) > 0}"> <p> - <label>Source: <select name="country"> + <label for="country">Source:</label> + <select name="country" id="country"> <c:forEach var="row" items="${country}"> <option value="${row[0]}"${row[1]}>${row[2]}</option> </c:forEach> </select> - </label> </p> </c:if> <c:if test="${fn:length(events) > 0}"> <p> - <label>Show possible censorship events if available (<a - href="http://research.torproject.org/techreports/detector-2011-09-09.pdf">BETA</a>) - <select name="events"> - <c:forEach var="row" items="${events}"> - <option value="${row[0]}"${row[1]}>${row[2]}</option> - </c:forEach> - </select> - </label> + <label for="events">Show possible censorship events if available (<a + href="http://research.torproject.org/techreports/detector-2011-09-09.pdf">BETA</a>)</label> + <select name="events" id="events"> + <c:forEach var="row" items="${events}"> + <option value="${row[0]}"${row[1]}>${row[2]}</option> + </c:forEach> + </select> </p> </c:if> <c:if test="${fn:length(transport) > 0}"> - <p>Source: - <c:forEach var="row" items="${transport}"> - <label class="checkbox-label"> - <input type="checkbox" name="transport" value="${row[0]}"${row[1]}> ${row[2]} - </label> - </c:forEach> + <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> </p> </c:if> <c:if test="${fn:length(version) > 0}"> <p> - <label>Source: - <select name="version"> - <c:forEach var="row" items="${version}"> - <option value="${row[0]}"${row[1]}>${row[2]}</option> - </c:forEach> - </select> - </label> + <label for="version">Source:</label> + <select name="version" id="version"> + <c:forEach var="row" items="${version}"> + <option value="${row[0]}"${row[1]}>${row[2]}</option> + </c:forEach> + </select> </p> </c:if> <c:if test="${fn:length(source) > 0}"> diff --git a/website/web/WEB-INF/table.jsp b/website/web/WEB-INF/table.jsp index bcc9c4d..07b3cc7 100644 --- a/website/web/WEB-INF/table.jsp +++ b/website/web/WEB-INF/table.jsp @@ -54,13 +54,11 @@ <form action="${id}.html"> <p> - <label>Start date (yyyy-mm-dd): - <input type="text" name="start" size="10" value="${start[0]}"> - </label> + <label for="start">Start date:</label> + <input type="text" name="start" size="10" value="${start[0]}" placeholder="yyyy-mm-dd" id="start"> </p><p> - <label>End date (yyyy-mm-dd): - <input type="text" name="end" size="10" value="${end[0]}"> - </label> + <label for="end">End date:</label> + <input type="text" name="end" size="10" value="${end[0]}" placeholder="yyyy-mm-dd" id="end"> </p><p> <input class="submit" type="submit" value="Update table"> </p>

1 0

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

09 Jan '17

commit 9db85309bff73e4ba461df208f3f4235510fe389 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 21 17:58:30 2016 +0100 Fix bubble graphs. --- website/web/WEB-INF/bubbles.jsp | 1 + website/web/js/bubbles.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/website/web/WEB-INF/bubbles.jsp b/website/web/WEB-INF/bubbles.jsp index 70af5d0..d0d8f84 100644 --- a/website/web/WEB-INF/bubbles.jsp +++ b/website/web/WEB-INF/bubbles.jsp @@ -62,6 +62,7 @@ information, country, or network family.</p> <a href="#country-exits-only" onclick="make_bubble_graph('country-exits-only');">Country</a> | <a href="#network-family-exits-only" onclick="make_bubble_graph('network-family-exits-only');">Network family (/16)</a> </p> + <div id="bubble-graph-placeholder"></div> <script src="js/d3.min.js"></script> <script src="js/bubbles.js"></script> <script>make_bubble_graph();</script> diff --git a/website/web/js/bubbles.js b/website/web/js/bubbles.js index 8030e20..b8c7194 100644 --- a/website/web/js/bubbles.js +++ b/website/web/js/bubbles.js @@ -53,7 +53,7 @@ function make_bubble_graph(graph_name) { .size([diameter, diameter]) .padding(1.5); - var svg = d3.select("body").append("svg") + var svg = d3.select("#bubble-graph-placeholder").append("svg") .attr("id", "bubble-graph") .attr("width", diameter + legendWidth) .attr("height", diameter)

1 0

[metrics-web/master] Shorten metrics titles and use term onion service.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 0ef3de4aa2e5bf1cee7fea6e96f0a96dc569ed3f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 23 10:28:04 2016 +0100 Shorten metrics titles and use term onion service. --- website/etc/metrics.json | 32 ++++++++++++++++---------------- website/web/WEB-INF/glossary.jsp | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/website/etc/metrics.json b/website/etc/metrics.json index 8fc3da6..e8e7e85 100644 --- a/website/etc/metrics.json +++ b/website/etc/metrics.json @@ -1,7 +1,7 @@ [ { "id": "networksize", - "title": "Relays and bridges in the network", + "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>", "function": "plot_networksize", @@ -15,9 +15,9 @@ }, { "id": "relayflags", - "title": "Relays with Exit, Fast, Guard, Stable, and HSDir flags", + "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 hidden service directory (\"HSDir\").</p>", + "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>", "function": "plot_relayflags", "parameters": [ "start", @@ -58,7 +58,7 @@ }, { "id": "bandwidth", - "title": "Total relay bandwidth in the network", + "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>", "function": "plot_bandwidth", @@ -72,7 +72,7 @@ }, { "id": "bwhist-flags", - "title": "Relay bandwidth by Exit and/or Guard 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>", "function": "plot_bwhist_flags", @@ -86,7 +86,7 @@ }, { "id": "bandwidth-flags", - "title": "Advertised bandwidth and bandwidth history by relay 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>", "function": "plot_bandwidth_flags", @@ -100,7 +100,7 @@ }, { "id": "dirbytes", - "title": "Number of bytes spent on answering directory requests", + "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>", "function": "plot_dirbytes", @@ -149,7 +149,7 @@ }, { "id": "userstats-relay-country", - "title": "Direct users by 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>", "function": "plot_userstats_relay_country", @@ -165,7 +165,7 @@ }, { "id": "userstats-relay-table", - "title": "Top-10 countries by directly connecting users", + "title": "Top-10 countries by relay users", "type": "Table", "description": "<p>The following table shows the top-10 countries by estimated number of directly-connecting <a href=\"glossary.html#client\">clients</a>. These numbers are derived from 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 numbers 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": "write_userstats_relay", @@ -293,7 +293,7 @@ }, { "id": "oxford-anonymous-internet", - "title": "Tor users as percentage of larger Internet population", + "title": "“The anonymous Internet”", "type": "Link", "description": "<p>The Oxford Internet Institute made a cartogram visualization of Tor users as compared to the overall Internet population. They used the average number of Tor <a href=\"glossary.html#client\">users</a> per country from August 2012 to August 2013 and put it in relation to total Internet users per country. More details and conclusions can be found on the <a href=\"http://geography.oii.ox.ac.uk/?page=tor\">Information Geographies website at the Oxford Internet Institute</a>.</p><p><a href=\"http://geography.oii.ox.ac.uk/?page=tor\"><img src=\"images/oxford-anonymous-internet.png\" alt=\"The anonymous Internet\"></a></p>" }, @@ -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#hidden-service\">hidden-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>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>", "function": "plot_hidserv_dir_onions_seen", "parameters": [ "start", @@ -359,9 +359,9 @@ }, { "id": "hidserv-rend-relayed-cells", - "title": "Hidden-service traffic", + "title": "Onion-service traffic", "type": "Graph", - "description": "<p>The following graph shows the amount of hidden-service traffic in the network per day. This number is extrapolated from aggregated statistics on hidden-service traffic reported by single <a href=\"glossary.html#relay\">relays</a> acting as rendezvous points for <a href=\"glossary.html#hidden-service\">hidden 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>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>", "function": "plot_hidserv_rend_relayed_cells", "parameters": [ "start", @@ -373,9 +373,9 @@ }, { "id": "hidserv-frac-reporting", - "title": "Fraction of relays reporting hidden-service statistics", + "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#hidden-service\">hidden 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>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>", "function": "plot_hidserv_frac_reporting", "parameters": [ "start", @@ -387,7 +387,7 @@ }, { "id": "uncharted-data-flow", - "title": "Data flow in the Tor network", + "title": "“TorFlow”", "type": "Link", "description": "<p>Uncharted made a visualization of data flow in the Tor network where they place each <a href=\"glossary.html#relay\">relay</a> on a world map and illustrate traffic exchanged between relays as animated dots. More details can be found on the <a href=\"https://torflow.uncharted.software/\">Uncharted website</a>.</p><p><a href=\"https://torflow.uncharted.software/\"><img src=\"images/uncharted-data-flow.png\" alt=\"Data flow in the Tor network\"></a></p>" }, diff --git a/website/web/WEB-INF/glossary.jsp b/website/web/WEB-INF/glossary.jsp index b1da872..9bdba38 100644 --- a/website/web/WEB-INF/glossary.jsp +++ b/website/web/WEB-INF/glossary.jsp @@ -81,8 +81,8 @@ information to clients, in order to reduce the load on <a href="#directory-authority">directory authorities</a>.</p> - <a name="hidden-service"></a> - <p><b><a href="#hidden-service">hidden service:</a></b> a location-hidden + <a name="onion-service"></a> + <p><b><a href="#onion-service">onion service:</a></b> a service (for example, a website or instant-messaging server) that is only accessible via the Tor network.</p>

1 0