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

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 05 Mar '18

05 Mar '18

commit 180f7d66fe81205ef91ffe98711a62c5860c4610 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 5 14:45:18 2018 +0000 Update translations for bridgedb_completed --- es/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- fr/LC_MESSAGES/bridgedb.po | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 7649d1815..77a71762f 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ # B. K., 2016 # BL <tresemes3(a)gmail.com>, 2014 # Edward Navarro, 2015 -# Emma Peel, 2017 +# Emma Peel, 2017-2018 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016 # Ignacio Rodríguez <inactive+i5o(a)transifex.com>, 2015 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-20 18:46+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2018-03-03 15:48+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -181,14 +181,14 @@ msgstr "[Este es un mensaje automático; por favor no responda.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Aquí tiene sus puentes:" +msgstr "Aquí tienes tus puentes:" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Ha excedido el límite de cuota. Por favor, ¡más despacio! El tiempo mínimo entre correos electrónicos es %s horas. Durante este periodo se ignorarán los correos. " +msgstr "Has excedido el límite de cuota. Por favor, ¡más despacio! El tiempo mínimo entre correos electrónicos es %s horas. Durante este periodo se ignorarán los correos. " #: bridgedb/strings.py:50 msgid "" @@ -271,7 +271,7 @@ msgstr "¿Qué son los puentes?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "Los %s puentes %s son repetidores Tor que le ayudan a eludir la censura." +msgstr "Los %s puentes %s son repetidores Tor que te ayudan a eludir la censura." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" @@ -283,7 +283,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Por favor, observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s o %s." +msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Ten en cuenta que tienes que enviar el correo usando una dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s o %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -293,7 +293,7 @@ msgstr "¡Mis puentes funcionan! ¡Necesito ayuda!" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Si su Tor no funciona, debe enviar un correo a %s" +msgstr "Si Tor no funciona, debes enviar un correo a %s" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -303,11 +303,11 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Intente incluir tanta información como pueda de su caso, incluyendo la lista de\npuentes y Pluggable Transports que intentó usar, versión de Navegador Tor y cualquier mensaje que Tor haya dado, etc." +msgstr "Intenta incluir tanta información como puedas sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, versión de Navegador Tor y cualquier mensaje que Tor haya dado, etc." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Estas son sus líneas de puente de red:" +msgstr "Estas son tus líneas de puente de red:" #: bridgedb/strings.py:129 msgid "Get Bridges!" diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index 78dad8fa2..8ea188131 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -29,7 +29,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-20 16:24+0000\n" +"PO-Revision-Date: 2018-03-01 18:53+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Mar '18

05 Mar '18

commit 12e4ce692d197ca81ae133a6c4720c3d8ae35930 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 5 14:45:08 2018 +0000 Update translations for bridgedb --- es/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- fr/LC_MESSAGES/bridgedb.po | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 7649d1815..77a71762f 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ # B. K., 2016 # BL <tresemes3(a)gmail.com>, 2014 # Edward Navarro, 2015 -# Emma Peel, 2017 +# Emma Peel, 2017-2018 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016 # Ignacio Rodríguez <inactive+i5o(a)transifex.com>, 2015 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-20 18:46+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2018-03-03 15:48+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -181,14 +181,14 @@ msgstr "[Este es un mensaje automático; por favor no responda.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Aquí tiene sus puentes:" +msgstr "Aquí tienes tus puentes:" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Ha excedido el límite de cuota. Por favor, ¡más despacio! El tiempo mínimo entre correos electrónicos es %s horas. Durante este periodo se ignorarán los correos. " +msgstr "Has excedido el límite de cuota. Por favor, ¡más despacio! El tiempo mínimo entre correos electrónicos es %s horas. Durante este periodo se ignorarán los correos. " #: bridgedb/strings.py:50 msgid "" @@ -271,7 +271,7 @@ msgstr "¿Qué son los puentes?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "Los %s puentes %s son repetidores Tor que le ayudan a eludir la censura." +msgstr "Los %s puentes %s son repetidores Tor que te ayudan a eludir la censura." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" @@ -283,7 +283,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Por favor, observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s o %s." +msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Ten en cuenta que tienes que enviar el correo usando una dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s o %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -293,7 +293,7 @@ msgstr "¡Mis puentes funcionan! ¡Necesito ayuda!" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Si su Tor no funciona, debe enviar un correo a %s" +msgstr "Si Tor no funciona, debes enviar un correo a %s" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -303,11 +303,11 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Intente incluir tanta información como pueda de su caso, incluyendo la lista de\npuentes y Pluggable Transports que intentó usar, versión de Navegador Tor y cualquier mensaje que Tor haya dado, etc." +msgstr "Intenta incluir tanta información como puedas sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, versión de Navegador Tor y cualquier mensaje que Tor haya dado, etc." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Estas son sus líneas de puente de red:" +msgstr "Estas son tus líneas de puente de red:" #: bridgedb/strings.py:129 msgid "Get Bridges!" diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index 78dad8fa2..8ea188131 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -29,7 +29,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-20 16:24+0000\n" +"PO-Revision-Date: 2018-03-01 18:53+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[webwml/master] Update project list
by colin＠torproject.org 05 Mar '18

05 Mar '18

commit 290ea35433011c54e30c9a6526a533f4f0884d03 Author: Colin Childs <colin(a)torproject.org> Date: Sun Mar 4 19:18:07 2018 -0600 Update project list --- getinvolved/en/volunteer.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 70f7f44e..6d38a40f 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -358,7 +358,8 @@ meetings around the world.</li> <p> <b>Project Ideas:</b><br /> - <i><a href="#improveOnionServices">Help improve Tor onion services</a></i><br /> + # <i><a href="#improveOnionServices">Help improve Tor onion services</a></i><br /> + <i><a href="#pythonTorClient">Python Tor Client</a></i><br /> <i><a href="#torFuzzing">Fuzzing coverage of Tor</a></i><br /> <i><a href="#relayCryptoParallelism">Relay crypto parallelism</a></i><br /> <i><a href="#anonymousLocalCountStatistics">Anonymous local count statistics</a></i><br /> @@ -384,8 +385,7 @@ meetings around the world.</li> <p> <b>Project Ideas:</b><br /> - <i><a href="#feedbackExtension">Feedback Extension for Tor Browser</a></i><br /> - <i><a href="#torBrowserCrashReport">Crash Reporter for Tor Browser</a></i><br /> + <i><a href="#metadataremoval">Remove metadata from Tor Browser uploads</a></i><br /> <i><a href="#fasterTorBrowser">Make Tor Browser Faster</a></i> </p>

1 0

[metrics-web/master] Adds text about Metrics ecosystem to about page (See: #23169)
by karsten＠torproject.org 04 Mar '18

04 Mar '18

commit 28d5eada13f1f8b2bb509e280afba01da5770ad3 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Mar 1 13:45:44 2018 +0000 Adds text about Metrics ecosystem to about page (See: #23169) --- src/main/resources/graphviz/ecosystem.gv | 56 ++++++++++++++++++++++ src/main/resources/web/images/ecosystem.png | Bin 0 -> 73561 bytes src/main/resources/web/jsps/about.jsp | 69 ++++++++++++++++++++++++---- 3 files changed, 115 insertions(+), 10 deletions(-) diff --git a/src/main/resources/graphviz/ecosystem.gv b/src/main/resources/graphviz/ecosystem.gv new file mode 100644 index 0000000..c5cdd5c --- /dev/null +++ b/src/main/resources/graphviz/ecosystem.gv @@ -0,0 +1,56 @@ +digraph ecosystem { + node [fontname="Source Sans Pro"]; + subgraph cluster_network { + label="Public Tor Network"; + fontname="Source Sans Pro Semi-Bold"; + node [color="#59316b",fillcolor="#e1d3e8",style="filled"]; + relays [label="Relays"]; + bridges [label="Bridges"]; + dirauths [label="Directory Authorities"]; + bridgeauth [label="Bridge Authority"]; + } + subgraph cluster_metrics { + label="Tor Metrics"; + fontname="Source Sans Pro Semi-Bold"; + labelloc=b; + subgraph resdev { + node [color="#6b5831",style="filled",fillcolor="#ede9e1"]; + collector [label="CollecTor"]; + onionoo [label="Onionoo"]; + subgraph lib { + node [shape=box,margin="0.11,0.11",height=0,width=0,fontsize=8]; + lib1 [label="metrics-lib"]; + lib2 [label="metrics-lib"]; + lib3 [label="metrics-lib"]; + } + } + subgraph user { + node [color="#436b31",style="filled",fillcolor="#d4e5cc"]; + statistics [label="Tor Metrics Graphs"]; + exonerator [label="Exonerator"]; + rs [label="Relay Search"]; + bot [label="metrics-bot"]; + consensushealth [label="Consensus Health"]; + } + } + relays -> dirauths; + bridges -> bridgeauth; + dirauths -> collector; + dirauths -> consensushealth; + bridgeauth -> collector; + collector -> lib1; + lib1 -> statistics; + collector -> lib2; + lib2 -> onionoo; + collector -> lib3; + lib3 -> exonerator; + onionoo -> rs; + onionoo -> bot; + legend [rank=sink,fontsize=10,shape=none,label= + <<table cellspacing="0" cellborder="1"> + <tr><td>Legend</td></tr> + <tr><td bgcolor="#e1d3e8" color="#59316b">Public Tor Network Servers</td></tr> + <tr><td bgcolor="#ede9e1" color="#6b5831">Tools for Researchers and Developers</td></tr> + <tr><td bgcolor="#d4e5cc" color="#436b31">Tools for End-Users</td></tr> + </table>>]; +} diff --git a/src/main/resources/web/images/ecosystem.png b/src/main/resources/web/images/ecosystem.png new file mode 100644 index 0000000..3b80ed1 Binary files /dev/null and b/src/main/resources/web/images/ecosystem.png differ diff --git a/src/main/resources/web/jsps/about.jsp b/src/main/resources/web/jsps/about.jsp index 7a4d303..bc14b08 100644 --- a/src/main/resources/web/jsps/about.jsp +++ b/src/main/resources/web/jsps/about.jsp @@ -14,20 +14,71 @@ <div class="container"> <h1>About <a href="#about" name="about" class="anchor">#</a></h1> - <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> + <p>Tor Metrics archives historical data about the Tor ecosystem, collects + data from the public Tor network and related services, and assists in + developing novel approaches to safe, privacy preserving data + collection.</p> - <div class="container"> <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> + <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> + + <h2>Ecosystem <a href="#ecosystem" name="ecosystem" class="anchor">#</a></h2> + <p>Tor relays and bridges collect aggregated statistics about their usage + including bandwidth and connecting clients per country. Source + aggregation is used to protect the privacy of connecting + users—discarding IP addresses and only reporting country + information from a local database mapping IP address ranges to countries. + These statistics are sent periodically to the directory authorities.</p> + <p><a href="/collector.html">CollecTor</a> + downloads the latest server descriptors, extra info descriptors + containing the aggregated statistics, and consensus documents from the + directory authorities and archives them. This archive is public and the + <a href="/metrics-lib.html">metrics-lib</a> + Java library can be used to parse the contents of the archive to perform + analysis of the data.</p> + <p>In order to provide easy access to visualizations of the historical + data archived, the Tor Metrics website contains a number of customizable + plots to show <a + href="/userstats-relay-country.html">user</a>, + <a href="/bandwidth.html">traffic</a>, <a + href="/relayflags.html">relay</a>, <a + href="/bridges-ipv6.html">bridge</a>, and + <a href="/webstats-tb.html">application + download</a> statistics over a requested time period and filtered to a + particular country.</p> + <p>In order to provide easy access to current information about the + public Tor network, <a + href="/onionoo.html">Onionoo</a> implements + a protocol to serve JSON documents over HTTP that can be consumed by + applications that would like to display information about relays along + with historical bandwidth, uptime, and consensus weight information.</p> + <p>An example of one such application is <a + href="/rs.html">Relay Search</a> which is + used by relay operators, those monitoring the health of the network, and + developers of software using the Tor network. Another example of such an + application is <a href="https://people.torproject.org/~irl/metrics-bot" + target="_blank">metrics-bot</a> which posts regular snapshots to <a + href="https://twitter.com/TorAtlas" target="_blank">Twitter</a> and <a + href="https://botsin.space/@metricsbot" target="_blank">Mastodon</a> + including country statistics and a world map plotting known relays.</p> + <p>The diagram below shows how data is collected, archived, analyzed, and + presented to users through services operated by Tor Metrics. The majority + of our services use metrics-lib to parse the descriptors that have been + collected by CollecTor as their source of raw data about the public Tor + network.</p> + <figure> + <img alt="Data flows from the public Tor network to the end user tools + Tor Metrics Graphs and Exonerator via CollecTor, and Relay Search and + metrics-bot via CollecTor and Onionoo." src="/images/ecosystem.png" + class="thumbnail img-responsive center-block"> + </figure> - <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> - <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> @@ -35,9 +86,7 @@ <pre>The Tor Project, Inc. 217 1st Ave South #4903 Seattle, WA 98194 USA</pre> - </div> - <div class="container"> <h2>Testimonials <a href="#testimonials" name="testimonials" class="anchor">#</a></h2> <blockquote> <p class="mb-0">

1 0

[metrics-web/master] Adds extended introduction and services to the home page (See: #23169)
by karsten＠torproject.org 04 Mar '18

04 Mar '18

commit 8f55bff0cc8fa70cce1ce8a87e0bb54a1bf739e4 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Mar 1 13:44:20 2018 +0000 Adds extended introduction and services to the home page (See: #23169) --- src/main/resources/web/css/style.css | 68 +++++++++++++++++++++-------- src/main/resources/web/jsps/index.jsp | 81 +++++++++++++++++++++++++++-------- 2 files changed, 115 insertions(+), 34 deletions(-) diff --git a/src/main/resources/web/css/style.css b/src/main/resources/web/css/style.css index b2485ff..97e91b8 100644 --- a/src/main/resources/web/css/style.css +++ b/src/main/resources/web/css/style.css @@ -14,7 +14,7 @@ body #wrapper { /* Page header - override bootstrap defaults */ .page-header { - padding: 0em 2.0em 2.0em 2.0em; + padding: 0em 2.0em 2.0em 2.0em; margin: 0; border-bottom: 0; color:#fff; @@ -33,20 +33,20 @@ body #wrapper { max-width:40%; height:auto; } -.page-header img#metrics-logo { - height:75px; - width:auto !important; -} +.page-header img#metrics-logo { + height:75px; + width:auto !important; +} .page-header div { text-align:right; position:absolute; right:2.5em; - bottom: 0.9em; - max-width: 400px; + bottom: 0.9em; + max-width: 400px; } .page-header div p { - font-size: 14px; - line-height: 16px; + font-size: 14px; + line-height: 16px; } @media (max-width: 767.99999px) { .page-header { @@ -59,7 +59,7 @@ body #wrapper { display:none; } } -@media (max-width: 1199.99999px) { +@media (max-width: 1199.99999px) { .page-header div { max-width:330px; } @@ -136,9 +136,9 @@ body { .navbar-secondary .section-header:first-of-type { margin-top:0px; } -.navbar-secondary .navbar-nav>li>a { - margin-bottom: 0px !important; -} +.navbar-secondary .navbar-nav>li>a { + margin-bottom: 0px !important; +} /* images */ @@ -336,10 +336,27 @@ body .topButton { color: #5bc0de; } +/* home jumbotron */ +.jumbotron { + padding-bottom: 10px; +} +.jumbotron h1 { + margin-top: -20px; + font-size: 50px; +} +@media only screen and (max-width : 991px) { .jumbotron h1 { font-size: 46px; } } +@media only screen and (max-width : 352px) { + .jumbotron h1 { + font-size: 38px; + } + .jumbotron p { + display: none; + } +} /* home dashboard page */ .dashboard { - padding:3em 5em 0 5em; + padding:0em 5em 0 5em; } .dashboard .col-sm-4 { margin-bottom:2em; @@ -353,10 +370,27 @@ body .topButton { padding:2em 2em 1em 2em; color:#999; } -.dashboard h2, .dashboard p { - color:#999; +.dashboard h2 { + font-size: 42px; + color: rgb(125, 70, 152); + padding-top: 0; + margin-top: 0; +} +.dashboard h3 { + font-size: 26px; +} +@media (max-width: 992px) { + .dashboard h3 { + font-size: 20px; + } +} +.dashboard h3, .dashboard p { + color: #999; +} +.dashboard p.lead { + color: #333; } -.dashboard a[href], .dashboard a[href]:hover, .dashboard a[href]:focus, .dashboard a[href]:active, .dashboard a[href] h2 { +.dashboard a[href], .dashboard a[href]:hover, .dashboard a[href]:focus, .dashboard a[href]:active, .dashboard a[href] h3 { color:#68b030; } .dashboard a[href]:hover { diff --git a/src/main/resources/web/jsps/index.jsp b/src/main/resources/web/jsps/index.jsp index 56e2afa..5968727 100644 --- a/src/main/resources/web/jsps/index.jsp +++ b/src/main/resources/web/jsps/index.jsp @@ -5,32 +5,79 @@ <jsp:param name="navActive" value="Home"/> </jsp:include> -  - <div class="container"> - <ul class="breadcrumb"> - <li class="active"> </li> - </ul> - </div> - <div class="container"> - <h1>Welcome!</h1> - <p> - What would you like to know about the <a href="https://www.torproject.org/" target="_blank">Tor</a> network? - </p> + <div class="jumbotron"> + <h1>Welcome to Tor Metrics!</h1> + <div class="row"> + <div class="col-md-6"> + <p>The <a href="https://www.torproject.org/" target="_blank">Tor</a> + network is one of the largest deployed anonymity networks, consisting of <a + href="/networksize.html"><span + id="latest_relay_count">thousands</span></a> of volunteer-run + relays and <a + href="/userstats-relay-country.html"><span + id="latest_user_count">millions</span></a> of users. + Users, advocates, relay operators, and journalists can better understand the Tor network + through data and analysis made available by Tor Metrics.</p> + </div> + <div class="col-md-6"> + <p>Analyzing a live anonymity system must be performed with great care so that + the users' privacy is not put at risk. Any metrics collected <i>must + not</i> undermine the anonymity or security properties of the Tor + network. <a href="/about.html">Read more »</a></p> + </div> + </div> </div> - <div class="container dashboard"> + <div class="dashboard"> + <h2><i class="fa fa-line-chart"></i> Analysis</h2> + <p class="lead">View visualizations of statistics collected from the public Tor network and from Tor Project infrastructure.</p> <div class="row"> - <c:forEach var="category" items="${categories}"> <div class="col-sm-4"> - <a<c:if test="${fn:length(category[0]) > 0}"> href="${category[0]}.html"</c:if>><i class="fa ${category[3]} fa-fw fa-4x" aria-hidden="true"></i> <h2>${category[1]}</h2> <p>${category[2]}</p></a> + <a href="userstats-relay-country.html"><i class="fa fa-users fa-fw fa-4x" aria-hidden="true"></i> <h3>Users</h3> <p>Where Tor users are from and how they connect to Tor.</p></a> + </div> + + <div class="col-sm-4"> + <a href="networksize.html"><i class="fa fa-server fa-fw fa-4x" aria-hidden="true"></i> <h3>Servers</h3> <p>How many relays and bridges are online and what we know about them.</p></a> + </div> + + <div class="col-sm-4"> + <a href="bandwidth.html"><i class="fa fa-road fa-fw fa-4x" aria-hidden="true"></i> <h3>Traffic</h3> <p>How much traffic the Tor network can handle and how much traffic there is.</p></a> + </div> + + <div class="col-sm-4"> + <a href="torperf.html"><i class="fa fa-dashboard fa-fw fa-4x" aria-hidden="true"></i> <h3>Performance</h3> <p>How fast and reliable the Tor network is.</p></a> + </div> + + <div class="col-sm-4"> + <a href="hidserv-dir-onions-seen.html"><i class="fa fa-map-signs fa-fw fa-4x" aria-hidden="true"></i> <h3>Onion Services</h3> <p>How many onion services there are and how much traffic they pull.</p></a> </div> - </c:forEach> + + <div class="col-sm-4"> + <a href="webstats-tb.html"><i class="fa fa-download fa-fw fa-4x" aria-hidden="true"></i> <h3>Applications</h3> <p>How many Tor applications, like Tor Browser, have been downloaded or updated.</p></a> + </div> + </div> </div> - <div class="container"> - <p><a href="about.html#contact">Let us know</a> if we're missing anything, or if we should measure something else.</p> + <div class="dashboard"> + <h2><i class="fa fa-cogs"></i> Services</h2> + <p class="lead">Perform interactive queries for more detailed information relating to relays or bridges in the public Tor network.</p> + <div class="row"> + <div class="col-sm-4"> + <a href="/rs.html#search"><i class="fa fa-search fa-fw fa-4x" aria-hidden="true"></i> <h3>Relay Search</h3> <p>Look up information on a particular Tor relay or bridge.</p></a> + </div> + + <div class="col-sm-4"> + <a href="/rs.html#aggregate"><i class="fa fa-compress fa-fw fa-4x" aria-hidden="true"></i> <h3>Aggregated Relay Search</h3> <p>Look up aggregated statistics on groups of relays.</p></a> + </div> + + <div class="col-sm-4"> + <a href="https://exonerator.torproject.org/"><i class="fa fa-history fa-fw fa-4x" aria-hidden="true"></i> <h3>Network Archive</h3> <p>Look up if a particular IP address was used as a Tor relay on a particular date.</p></a> + </div> + + </div> + </div> </div> <jsp:include page="bottom.jsp"/>

1 0

[metrics-web/master] Adds an Ant target to generate PNGs using Graphviz
by karsten＠torproject.org 04 Mar '18

04 Mar '18

commit 252d4635df29db2a984f4bf75e0b0a8910e44370 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sat Mar 3 06:35:34 2018 +0000 Adds an Ant target to generate PNGs using Graphviz --- build.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/build.xml b/build.xml index 4b67ae6..59f3720 100644 --- a/build.xml +++ b/build.xml @@ -220,6 +220,21 @@ </exec> </target> + <target name="generate-graphviz-pngs" > + <apply executable="dot" + dest="${basedir}/src/main/resources/web/images" + verbose="true" > + <arg value="-Tpng" /> + <arg value="-o" /> + <targetfile /> + <srcfile /> + <fileset dir="${basedir}/src/main/resources/graphviz" > + <include name="*.gv" /> + </fileset> + <mapper type="glob" from="*.gv" to="*.png" /> + </apply> + </target> +  <property name="prepare.deployment" value="/srv/metrics.torproject.org/metrics/work" />

1 0

[metrics-web/master] Expand Philosophy text on about page (See: #23169)
by karsten＠torproject.org 04 Mar '18

04 Mar '18

commit 4a6b9deb39fe1011963066a78ee1512d20bad64f Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Mar 1 14:21:06 2018 +0000 Expand Philosophy text on about page (See: #23169) --- src/main/resources/web/jsps/about.jsp | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/main/resources/web/jsps/about.jsp b/src/main/resources/web/jsps/about.jsp index bc14b08..dbd1be9 100644 --- a/src/main/resources/web/jsps/about.jsp +++ b/src/main/resources/web/jsps/about.jsp @@ -24,6 +24,43 @@ 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> + <p>The goals of a privacy and anonymity network like Tor are not easily + combined with extensive data gathering, but at the same time data is needed for + monitoring, understanding, and improving the network. Data can be used to + detect possible censorship events or attacks against the network. Safety and + privacy concerns regarding data collection by Tor Metrics are guided by the <a + href="https://research.torproject.org/safetyboard.html#guidelines">Tor Research + Safety Board's guidelines</a>. Safety and privacy assessment is usually done + openly by discussion during the proposal process for changes to the Tor source, + and/or supported by closer analysis in form of <a + href="https://research.torproject.org/techreports.html">Tor Technical + Reports</a>.</p> + <p>For data we collect from the public Tor network, we will always follow + three main guidelines:</p> + <dl class="dl-horizontal"> + <dt>Data minimalism</dt> + <dd>The first and most important guideline is that only the minimum + amount of statistical data should be gathered to solve a given problem. + The level of detail of measured data should be as small as possible.</dd> + <dt>Source aggregation</dt> + <dd>Possibly sensitive data should exist for as short a time + as possible. Data should be aggregated at its source, including + categorizing single events and memorizing category counts only, summing + up event counts over large time frames, and being imprecise regarding + exact event counts.</dd> + <dt>Transparency</dt> + <dd>All algorithms to gather statistical data need to be discussed + publicly before deploying them. All measured statistical data should be + made publicly available as a safeguard to not gather data that is too + sensitive.</dd> + </dl> + <p>You can read more about safety considerations when collecting data in + the Tor network in "<a + href="https://www.freehaven.net/anonbib/#wecsr10measuring-tor">A Case + Study on Measuring Statistical Data in the Tor Anonymity Network</a>" by + Karsten Loesing, Steven J. Murdoch, and Roger Dingledine. <i>In the + Proceedings of the Workshop on Ethics in Computer Security Research + (WECSR 2010), Tenerife, Canary Islands, Spain, January 2010.</i></p> <h2>Ecosystem <a href="#ecosystem" name="ecosystem" class="anchor">#</a></h2> <p>Tor relays and bridges collect aggregated statistics about their usage

1 0

[metrics-web/master] Bumps copyright year to 2018 in common JSP footer
by karsten＠torproject.org 04 Mar '18

04 Mar '18

commit 187cb1e86808eda2555eee7ac25fe953452e766b Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Fri Mar 2 13:08:09 2018 +0000 Bumps copyright year to 2018 in common JSP footer --- src/main/resources/web/jsps/bottom.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/jsps/bottom.jsp b/src/main/resources/web/jsps/bottom.jsp index 6719adc..85db407 100644 --- a/src/main/resources/web/jsps/bottom.jsp +++ b/src/main/resources/web/jsps/bottom.jsp @@ -3,7 +3,7 @@ <div class="container no-gutter"> <div class="col-xs-6"> <p> - © 2009–2017 <a href="https://www.torproject.org/" target="_blank">The Tor Project</a> + © 2009–2018 <a href="https://www.torproject.org/" target="_blank">The Tor Project</a> </p> </div> <div class="col-xs-6">

1 0

[stem/master] Drop test assertion about HS key length
by atagar＠torproject.org 04 Mar '18

04 Mar '18

commit 3e1414f819441328d80fb972547a4fadd28f1479 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 3 16:18:15 2018 -0800 Drop test assertion about HS key length Jenkins tests failed. Seems the length of these can vary a bit after all. --- test/integ/control/controller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index a3b8af38..87d6e970 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -581,7 +581,7 @@ class TestController(unittest.TestCase): with runner.get_tor_controller() as controller: response = controller.create_ephemeral_hidden_service(4567, key_content = 'RSA1024') self.assertEqual([response.service_id], controller.list_ephemeral_hidden_services()) - self.assertEqual(812, len(response.private_key)) + self.assertTrue(response.private_key is not None) self.assertEqual('RSA1024', response.private_key_type) self.assertEqual({}, response.client_auth) @@ -626,7 +626,7 @@ class TestController(unittest.TestCase): with runner.get_tor_controller() as controller: response = controller.create_ephemeral_hidden_service(4567, key_content = 'ED25519-V3') self.assertEqual([response.service_id], controller.list_ephemeral_hidden_services()) - self.assertEqual(88, len(response.private_key)) + self.assertTrue(response.private_key is not None) self.assertEqual('ED25519-V3', response.private_key_type) self.assertEqual({}, response.client_auth)

1 0

[stem/master] Document v3 hidden service support
by atagar＠torproject.org 04 Mar '18

04 Mar '18

commit 53e73ad8ac9ad8af54ca64d57895b2b35ad9ee5f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 3 15:58:35 2018 -0800 Document v3 hidden service support Huh, didn't expect that. Unless I'm missing something there isn't much for us to do in Stem for v3 Hidden Service support. We already let users specify their key type so callers could already pick the protocol version to use... # To create a v2 hidden service... controller.create_ephemeral_hidden_service(443, key_content = 'RSA1024') # To create a v3 hidden service... controller.create_ephemeral_hidden_service(443, key_content = 'ED25519-V3') # To create a hidden service based on the HiddenServiceVersion in your # torrc... controller.create_ephemeral_hidden_service(443) Pretty much all there was to do was document and add an integ test. Neat. :P https://trac.torproject.org/projects/tor/ticket/25124 https://gitweb.torproject.org/torspec.git/commit/?id=6bd0a69 --- docs/change_log.rst | 1 + stem/control.py | 13 ++++++-- stem/interpreter/settings.cfg | 2 ++ stem/response/events.py | 6 +++- stem/version.py | 2 ++ test/integ/control/controller.py | 67 ++++++++++++++++++++++++++++++++++------ 6 files changed, 77 insertions(+), 14 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 4a5e927b..bb42c982 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -46,6 +46,7 @@ The following are only available within Stem's `git repository * **Controller** + * Documented v3 hidden service support (:trac:`25124`, :spec:`6bd0a69`) * Added support for limiting the maximum number of streams to :func:`~stem.control.Controller.create_ephemeral_hidden_service` (:spec:`2fcb1c2`) * Stacktrace if :func:`stem.connection.connect` had a string port argument * Replaced socket's :func:`~stem.socket.ControlPort.get_address`, :func:`~stem.socket.ControlPort.get_port`, and :func:`~stem.socket.ControlSocketFile.get_socket_path` with attributes diff --git a/stem/control.py b/stem/control.py index 04cd0246..5ccc318f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1987,6 +1987,8 @@ class Controller(BaseController): If **await_result** is **True** then this blocks until we either receive the descriptor or the request fails. If **False** this returns right away. + **This method only supports v2 hidden services, not v3.** (:trac:`25417`) + .. versionadded:: 1.4.0 :param str address: address of the hidden service descriptor, the '.onion' suffix is optional @@ -2853,6 +2855,11 @@ class Controller(BaseController): 'bob': 'vGnNRpWYiMBFTWD2gbBlcA', }) + To create a **version 3** service simply specify **ED25519-V3** as the + key_type, and to create a **version 2** service use **RSA1024**. The + default version of newly created hidden services is based on the + **HiddenServiceVersion** value in your torrc. + .. versionadded:: 1.4.0 .. versionchanged:: 1.5.0 @@ -2869,10 +2876,10 @@ class Controller(BaseController): :param int,list,dict ports: hidden service port(s) or mapping of hidden service ports to their targets :param str key_type: type of key being provided, generates a new key if - 'NEW' (options are: **NEW** and **RSA1024**) + 'NEW' (options are: **NEW**, **RSA1024**, and **ED25519-V3**) :param str key_content: key for the service to use or type of key to be - generated (options when **key_type** is **NEW** are **BEST** and - **RSA1024**) + generated (options when **key_type** is **NEW** are **BEST**, + **RSA1024**, and **ED25519-V3**) :param bool discard_key: avoid providing the key back in our response :param bool detached: continue this hidden service even after this control connection is closed if **True** diff --git a/stem/interpreter/settings.cfg b/stem/interpreter/settings.cfg index cc8da378..af96d599 100644 --- a/stem/interpreter/settings.cfg +++ b/stem/interpreter/settings.cfg @@ -323,7 +323,9 @@ autocomplete AUTHCHALLENGE autocomplete DROPGUARDS autocomplete ADD_ONION NEW:BEST autocomplete ADD_ONION NEW:RSA1024 +autocomplete ADD_ONION NEW:ED25519-V3 autocomplete ADD_ONION RSA1024: +autocomplete ADD_ONION ED25519-V3: autocomplete DEL_ONION autocomplete HSFETCH autocomplete HSPOST diff --git a/stem/response/events.py b/stem/response/events.py index e8c8a6e0..6d62fbb8 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -652,6 +652,9 @@ class HSDescEvent(Event): .. versionchanged:: 1.5.0 Added the replica attribute. + .. versionchanged:: 1.7.0 + Added the index attribute. + :var stem.HSDescAction action: what is happening with the descriptor :var str address: hidden service address :var stem.HSAuth authentication: service's authentication method @@ -661,11 +664,12 @@ class HSDescEvent(Event): :var str descriptor_id: descriptor identifier :var stem.HSDescReason reason: reason the descriptor failed to be fetched :var int replica: replica number the descriptor involves + :var str index: computed index of the HSDir the descriptor was uploaded to or fetched from """ _VERSION_ADDED = stem.version.Requirement.EVENT_HS_DESC _POSITIONAL_ARGS = ('action', 'address', 'authentication', 'directory', 'descriptor_id') - _KEYWORD_ARGS = {'REASON': 'reason', 'REPLICA': 'replica'} + _KEYWORD_ARGS = {'REASON': 'reason', 'REPLICA': 'replica', 'HSDIR_INDEX': 'index'} def _parse(self): self.directory_fingerprint = None diff --git a/stem/version.py b/stem/version.py index 03eb549c..9de2f1a5 100644 --- a/stem/version.py +++ b/stem/version.py @@ -61,6 +61,7 @@ easily parsed and compared, for instance... **FEATURE_VERBOSE_NAMES** 'VERBOSE_NAMES' optional feature **GETINFO_CONFIG_TEXT** 'GETINFO config-text' query **GETINFO_GEOIP_AVAILABLE** 'GETINFO ip-to-country/ipv4-available' query and its ipv6 counterpart + **HIDDEN_SERVICE_V3** Support for v3 hidden services **HSFETCH** HSFETCH requests **HSPOST** HSPOST requests **ADD_ONION** ADD_ONION and DEL_ONION requests @@ -378,6 +379,7 @@ Requirement = stem.util.enum.Enum( ('FEATURE_VERBOSE_NAMES', Version('0.2.2.1-alpha')), ('GETINFO_CONFIG_TEXT', Version('0.2.2.7-alpha')), ('GETINFO_GEOIP_AVAILABLE', Version('0.3.2.1-alpha')), + ('HIDDEN_SERVICE_V3', Version('0.3.3.1-alpha')), ('HSFETCH', Version('0.2.7.1-alpha')), ('HSPOST', Version('0.2.7.1-alpha')), ('ADD_ONION', Version('0.2.7.1-alpha')), diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 16061eee..a3b8af38 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -563,24 +563,71 @@ class TestController(unittest.TestCase): @test.require.controller @test.require.version(Requirement.ADD_ONION) - def test_with_ephemeral_hidden_services(self): + def test_with_invalid_ephemeral_hidden_service_port(self): + with test.runner.get_runner().get_tor_controller() as controller: + for ports in (4567890, [4567, 4567890], {4567: '-:4567'}): + exc_msg = "ADD_ONION response didn't have an OK status: Invalid VIRTPORT/TARGET" + self.assertRaisesRegexp(stem.ProtocolError, exc_msg, controller.create_ephemeral_hidden_service, ports) + + @test.require.controller + @test.require.version(Requirement.ADD_ONION) + def test_ephemeral_hidden_services_v2(self): """ - Exercises creating ephemeral hidden services and methods when they're - present. + Exercises creating v2 ephemeral hidden services. """ runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - # try creating a service with an invalid ports + response = controller.create_ephemeral_hidden_service(4567, key_content = 'RSA1024') + self.assertEqual([response.service_id], controller.list_ephemeral_hidden_services()) + self.assertEqual(812, len(response.private_key)) + self.assertEqual('RSA1024', response.private_key_type) + self.assertEqual({}, response.client_auth) - for ports in (4567890, [4567, 4567890], {4567: '-:4567'}): - exc_msg = "ADD_ONION response didn't have an OK status: Invalid VIRTPORT/TARGET" - self.assertRaisesRegexp(stem.ProtocolError, exc_msg, controller.create_ephemeral_hidden_service, ports) + # drop the service + + self.assertEqual(True, controller.remove_ephemeral_hidden_service(response.service_id)) + self.assertEqual([], controller.list_ephemeral_hidden_services()) + + # recreate the service with the same private key - response = controller.create_ephemeral_hidden_service(4567) + recreate_response = controller.create_ephemeral_hidden_service(4567, key_type = response.private_key_type, key_content = response.private_key) self.assertEqual([response.service_id], controller.list_ephemeral_hidden_services()) - self.assertTrue(response.private_key is not None) + self.assertEqual(response.service_id, recreate_response.service_id) + + # the response only includes the private key when making a new one + + self.assertEqual(None, recreate_response.private_key) + self.assertEqual(None, recreate_response.private_key_type) + + # create a service where we never see the private key + + response = controller.create_ephemeral_hidden_service(4568, key_content = 'RSA1024', discard_key = True) + self.assertTrue(response.service_id in controller.list_ephemeral_hidden_services()) + self.assertEqual(None, response.private_key) + self.assertEqual(None, response.private_key_type) + + # other controllers shouldn't be able to see these hidden services + + with runner.get_tor_controller() as second_controller: + self.assertEqual(2, len(controller.list_ephemeral_hidden_services())) + self.assertEqual(0, len(second_controller.list_ephemeral_hidden_services())) + + @test.require.controller + @test.require.version(Requirement.HIDDEN_SERVICE_V3) + def test_ephemeral_hidden_services_v3(self): + """ + Exercises creating v3 ephemeral hidden services. + """ + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + response = controller.create_ephemeral_hidden_service(4567, key_content = 'ED25519-V3') + self.assertEqual([response.service_id], controller.list_ephemeral_hidden_services()) + self.assertEqual(88, len(response.private_key)) + self.assertEqual('ED25519-V3', response.private_key_type) self.assertEqual({}, response.client_auth) # drop the service @@ -601,7 +648,7 @@ class TestController(unittest.TestCase): # create a service where we never see the private key - response = controller.create_ephemeral_hidden_service(4568, discard_key = True) + response = controller.create_ephemeral_hidden_service(4568, key_content = 'ED25519-V3', discard_key = True) self.assertTrue(response.service_id in controller.list_ephemeral_hidden_services()) self.assertEqual(None, response.private_key) self.assertEqual(None, response.private_key_type)

1 0