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

[atlas/master] oops: primary IP address not first IP address
by irl＠torproject.org 14 Nov '17

14 Nov '17

commit a3584646af542b7639f2972ff6dbb25ba3e0397e Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Nov 14 14:31:08 2017 +0000 oops: primary IP address not first IP address --- templates/details/router.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index 4dc90be..17ebb16 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -120,7 +120,7 @@ <%=propertyCount==0?'none':''%> </dd> - <dt><span class="tip" title="Host name as found in a reverse DNS lookup of the relay's first IP address. This field is updated at most once in 12 hours, unless the relay IP address changes. Omitted if the relay IP address was not looked up, if no lookup request was successful yet or if no A record was found matching the PTR record.">Host Name</span></dt> + <dt><span class="tip" title="Host name as found in a reverse DNS lookup of the relay's primary IP address. This field is updated at most once in 12 hours, unless the relay IP address changes. Omitted if the relay IP address was not looked up, if no lookup request was successful yet or if no A record was found matching the PTR record.">Host Name</span></dt> <dd><% if (relay.get('host_name')) { %><%= relay.get('host_name') %><% } else { %>No PTR record found<% } %></dd> <dt><span class="tip" title="Country as found in a GeoIP database by resolving the relay's first onion-routing address.">Country</span></dt>

1 0

[atlas/master] details: Improves tooltip on DNS name field (#23522)
by irl＠torproject.org 14 Nov '17

14 Nov '17

commit ce07ca3b784f9b76def9387790731268a5ee4750 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Nov 14 14:28:59 2017 +0000 details: Improves tooltip on DNS name field (#23522) --- templates/details/router.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index 2909c67..4dc90be 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -120,7 +120,7 @@ <%=propertyCount==0?'none':''%> </dd> - <dt><span class="tip" title="The DNS name for the relay as found by performing a reverse lookup on its first IP address.">DNS Name</span></dt> + <dt><span class="tip" title="Host name as found in a reverse DNS lookup of the relay's first IP address. This field is updated at most once in 12 hours, unless the relay IP address changes. Omitted if the relay IP address was not looked up, if no lookup request was successful yet or if no A record was found matching the PTR record.">Host Name</span></dt> <dd><% if (relay.get('host_name')) { %><%= relay.get('host_name') %><% } else { %>No PTR record found<% } %></dd> <dt><span class="tip" title="Country as found in a GeoIP database by resolving the relay's first onion-routing address.">Country</span></dt>

1 0

[atlas/master] add years to first seen #23890
by irl＠torproject.org 14 Nov '17

14 Nov '17

commit d660d2bdbcf35d1d1ed2158543897c79e04fb3ad Author: Joren Vandeweyer <joren(a)Joren.local> Date: Fri Oct 20 22:46:22 2017 +0200 add years to first seen #23890 --- js/models/relay.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/js/models/relay.js b/js/models/relay.js index 1e9f812..c90ffe0 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -69,13 +69,27 @@ define([ var mins = Math.floor(secs/60); var hours = Math.floor(mins/60); var days = Math.floor(hours/24); + var years = Math.floor(days/365); // XXX check if this formula is correct. secs = secs % 60; mins = mins % 60; hours = hours % 24; + days = days % 365; + var hr_date = ""; var hr_date_full = ""; var hr = 0; + + if (years > 0) { + hr_date += years + "y "; + hr += 1; + if (years > 1) { + hr_date_full += years + " years "; + } else { + hr_date_full += years + " year "; + } + } + if (days > 0) { hr_date += days + "d "; hr += 1; @@ -216,4 +230,3 @@ define([ return relayModel; }); -

1 0

[atlas/master] Fixes the display of long contact information (#23868)
by irl＠torproject.org 14 Nov '17

14 Nov '17

commit 261aa0a43b28810b1e90be902fa2c20fc7ba6b6a Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Nov 14 13:39:08 2017 +0000 Fixes the display of long contact information (#23868) --- css/atlas.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/css/atlas.css b/css/atlas.css index 5d0f554..f26fa7d 100644 --- a/css/atlas.css +++ b/css/atlas.css @@ -74,3 +74,16 @@ table input { .flags-cell { width: 150px; } + +/* Allow displaying long contact info (#23868) */ +dd { + -ms-word-break: break-all; + word-break: break-all; + + /* Non standard for webkit */ + word-break: break-word; + + -webkit-hyphens: auto; + -moz-hyphens: auto; + hyphens: auto; +}

1 0

[atlas/master] Change Top 10 relays to query 50 relays (#23871)
by irl＠torproject.org 14 Nov '17

14 Nov '17

commit bd2cdcd476ccc01055762e1cf7713fc45d61cba6 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Nov 14 13:51:27 2017 +0000 Change Top 10 relays to query 50 relays (#23871) --- js/router.js | 11 ++++++----- js/views/search/main.js | 4 ++-- templates/search/main.html | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/router.js b/js/router.js index 3c66664..c4966f7 100644 --- a/js/router.js +++ b/js/router.js @@ -13,7 +13,8 @@ define([ // Define the routes for the actions in Atlas 'details/:fingerprint': 'mainDetails', 'search/:query': 'doSearch', - 'top10': 'showTop10', + 'top10': 'showTopRelays', + 'toprelays': 'showTopRelays', // Default '*actions': 'defaultAction' }, @@ -92,19 +93,19 @@ define([ }); } }, - showTop10: function(){ - $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Top 10 Relays</li>"); + showTopRelays: function(){ + $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Top Relays</li>"); $("#content").hide(); $(".progress").show(); - doSearchView.collection.url = "https://onionoo.torproject.org/summary?type=relay&order=-consensus_weight&l…"; + doSearchView.collection.url = "https://onionoo.torproject.org/summary?type=relay&order=-consensus_weight&l…"; doSearchView.collection.lookup({ success: function(err){ doSearchView.relays = doSearchView.collection.models; doSearchView.error = err; doSearchView.render(""); - $("#search-title").text("Top 10 Relays by Consensus Weight"); + $("#search-title").text("Top Relays by Consensus Weight"); $(".progress").hide(); $("#content").show(); }, diff --git a/js/views/search/main.js b/js/views/search/main.js index bfb069b..d5142c2 100644 --- a/js/views/search/main.js +++ b/js/views/search/main.js @@ -14,8 +14,8 @@ define([ var compiledTemplate = _.template(mainSearchTemplate, data); this.el.html(compiledTemplate); - $("#do-top10").bind('click', function(){ - document.location = "#top10"; + $("#do-top-relays").bind('click', function(){ + document.location = "#toprelays"; return false; }); diff --git a/templates/search/main.html b/templates/search/main.html index aa835f2..13b4a0a 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -4,7 +4,7 @@ with graphs about their past.</p> <form id="home-search"> <div class="input-group"> <input class="search-query form-control" id="query" placeholder="Query" type="text"> - <span class="input-group-btn"><button id="do-search" class="btn btn-primary" type="button">Search</button><button class="btn btn-secondary" type="button" id="do-top10">Top 10</button></span> + <span class="input-group-btn"><button id="do-search" class="btn btn-primary" type="button">Search</button><button class="btn btn-secondary" type="button" id="do-top-relays">Top Relays</button></span> </div> </form> <div class="well">

1 0

[metrics-web/master] Explain sorting more prominently.
by karsten＠torproject.org 14 Nov '17

14 Nov '17

commit 76688eec38bc02a2813ae9bf9a72f1f1c2c239c3 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Nov 14 08:39:29 2017 +0000 Explain sorting more prominently. Also make the point that normal web log analyzers can operate on sanitized logs. Improvements were suggested by Sebastian, cf. ticket-23243. --- .../src/main/resources/spec/web-server-logs.xml | 17 +++++++------ .../main/resources/web/WEB-INF/web-server-logs.jsp | 29 +++++++++++++--------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/website/src/main/resources/spec/web-server-logs.xml b/website/src/main/resources/spec/web-server-logs.xml index d8efe53..13cfad7 100644 --- a/website/src/main/resources/spec/web-server-logs.xml +++ b/website/src/main/resources/spec/web-server-logs.xml @@ -20,7 +20,7 @@ </front> <middle> <section title="Purpose of this document"> - <t>BETA: As of November 8, 2017, this document is still under + <t>BETA: As of November 14, 2017, this document is still under discussion and subject to change without prior notice. Feel free to <eref target="/about.html#contact">contact us</eref> for questions or concerns regarding this document.</t> @@ -174,6 +174,12 @@ mod_log_config module</eref>.</t> <section title="Re-assembling log files"> <t>Rewritten log lines are re-assembled into sanitized log files based on physical host, virtual host, and request start date.</t> + <t>All rewritten log lines are sorted alphabetically, so that request + order cannot be inferred from sanitized log files.</t> + <t>Many of the sanitized log lines will now be identical. + But in order to not remove too much useful information we keep the + identical log lines and thus enable typical web log analyzers to + operate on the sanitized log files. </t> <t>The naming convention for sanitized log files is: <list> <t><virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</t> @@ -190,12 +196,9 @@ mod_log_config module</eref>.</t> 'dist.torproject.org', are more familiar to the public and were therefore chosen to be the first naming component. </t> - <t>As last and certainly not least important sanitizing step, all - rewritten log lines are sorted alphabetically, so that request order - cannot be inferred from sanitized log files.</t> - <t>Sanitized log files are typically compressed before publication. In - particular the sorting step allows for highly efficient compression - rates. We typically use XZ for compression, which is indicated by + <t>Sanitized log files are typically compressed before publication. + The sorting step also allows for highly efficient compression rates. + We typically use XZ for compression, which is indicated by appending ".xz" to log file names, but this is subject to change.</t> </section> </section> diff --git a/website/src/main/resources/web/WEB-INF/web-server-logs.jsp b/website/src/main/resources/web/WEB-INF/web-server-logs.jsp index b1505df..5e9cc79 100644 --- a/website/src/main/resources/web/WEB-INF/web-server-logs.jsp +++ b/website/src/main/resources/web/WEB-INF/web-server-logs.jsp @@ -22,7 +22,7 @@ "#rfc.section.1">1.</a> <a href= "#n-purpose-of-this-document">Purpose of this document</a></h2> <div id="rfc.section.1.p.1"> -<p>BETA: As of November 8, 2017, this document is still under +<p>BETA: As of November 14, 2017, this document is still under discussion and subject to change without prior notice. Feel free to <a href="/about.html#contact">contact us</a> for questions or concerns regarding this document.</p> @@ -254,6 +254,16 @@ of processing that format.</p> based on physical host, virtual host, and request start date.</p> </div> <div id="rfc.section.4.3.p.2"> +<p>All rewritten log lines are sorted alphabetically, so that +request order cannot be inferred from sanitized log files.</p> +</div> +<div id="rfc.section.4.3.p.3"> +<p>Many of the sanitized log lines will now be identical. But in +order to not remove too much useful information we keep the +identical log lines and thus enable typical web log analyzers to +operate on the sanitized log files.</p> +</div> +<div id="rfc.section.4.3.p.4"> <p>The naming convention for sanitized log files is:</p> <ul class="empty"> <li> @@ -262,7 +272,7 @@ based on physical host, virtual host, and request start date.</p> <p>The underscore is a separator symbol between the various parts of the filename.</p> </div> -<div id="rfc.section.4.3.p.3"> +<div id="rfc.section.4.3.p.5"> <p>Sanitized log files may additionally be sorted into directories by virtual host and date as in:</p> <ul class="empty"> @@ -273,17 +283,12 @@ by virtual host and date as in:</p> 'dist.torproject.org', are more familiar to the public and were therefore chosen to be the first naming component.</p> </div> -<div id="rfc.section.4.3.p.4"> -<p>As last and certainly not least important sanitizing step, all -rewritten log lines are sorted alphabetically, so that request -order cannot be inferred from sanitized log files.</p> -</div> -<div id="rfc.section.4.3.p.5"> +<div id="rfc.section.4.3.p.6"> <p>Sanitized log files are typically compressed before publication. -In particular the sorting step allows for highly efficient -compression rates. We typically use XZ for compression, which is -indicated by appending ".xz" to log file names, but this is subject -to change.</p> +The sorting step also allows for highly efficient compression +rates. We typically use XZ for compression, which is indicated by +appending ".xz" to log file names, but this is subject to +change.</p> </div> </section> </div>

1 0

[metrics-web/master] Rename Atlas to Relay Search.
by karsten＠torproject.org 14 Nov '17

14 Nov '17

commit d09dc8583e4e7a197b060f4a16d10d245b8b4d34 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 14 14:02:52 2017 +0100 Rename Atlas to Relay Search. Part of #23518. --- website/src/main/resources/web/WEB-INF/services.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/main/resources/web/WEB-INF/services.jsp b/website/src/main/resources/web/WEB-INF/services.jsp index 5eac330..3d4f330 100644 --- a/website/src/main/resources/web/WEB-INF/services.jsp +++ b/website/src/main/resources/web/WEB-INF/services.jsp @@ -29,7 +29,7 @@ <h2>Network status <a href="#status" name="status" class="anchor">#</a></h2> <p>The following tools let you explore currently running relays and bridges.</p> <ul> - <li><a href="https://atlas.torproject.org/" target="_blank">Atlas</a> displays data about single relays and bridges in the Tor network.</li> + <li><a href="https://atlas.torproject.org/">Relay Search</a> displays data about single relays and bridges in the Tor Network.</li> <li><a href="https://compass.torproject.org/" target="_blank">Compass</a> groups current relays in different ways to measure Tor's network diversity.</li> <li><a href="https://consensus-health.torproject.org/" target="_blank">Consensus Health</a> displays information about the current directory consensus and votes.</li> <li><a href="https://duckduckgo.com/" target="_blank">DuckDuckGo</a> displays Tor node details when including the keywords "tor node" in a search.</li>

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 14 Nov '17

14 Nov '17

commit c22f76a466bb21111f693d3d3c2189201a6dce5d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 14 12:46:54 2017 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 50b72ffeb..713a7f814 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor 网络设置"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "已连接到 Tor 网络"> +<!ENTITY torsettings.wizard.title.configure "Tor 网络设置"> +<!ENTITY torsettings.wizard.title.connecting "正在建立连接">  <!ENTITY torlauncher.localePicker.title "Tor Browser 语言"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "请点击“连接”以连接至 Tor 网络。"> +<!ENTITY torSettings.configurePrompt "如果您所在国家（如中国、伊朗和叙利亚）对 Tor 进行封锁，或者需要代理访问互联网，请点击“配置”，对网络设置进行调整。"> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connect "连接"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "可选"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "使用代理访问互联网"> <!ENTITY torsettings.useProxy.type "代理类型："> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "选择代理类型"> <!ENTITY torsettings.useProxy.address "地址："> <!ENTITY torsettings.useProxy.address.placeholder "IP 地址或主机名"> <!ENTITY torsettings.useProxy.port "端口："> @@ -38,16 +38,16 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.checkbox "我所在国家对 Tor 进行了封锁"> +<!ENTITY torsettings.useBridges.default "选择内置网桥"> +<!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.placeholder "输入地址:端口（每行一个）"> <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelpTitle "代理帮助"> <!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助">

1 0

[atlas/master] index: Remove top button, it conflicts with url routing
by irl＠torproject.org 14 Nov '17

14 Nov '17

commit f1790521bc056cd8c867daa6caf0e567a51ed135 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Nov 14 10:50:50 2017 +0000 index: Remove top button, it conflicts with url routing --- index.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/index.html b/index.html index 2cbc6c7..9b2bd29 100644 --- a/index.html +++ b/index.html @@ -50,15 +50,6 @@ <div id="wrapper" style="display:none;"> - -<noscript> -<div class="topButton" style="display:block;"><a href="#top"><i class="fa fa-chevron-up" aria-hidden="true"></i></a></div> -</noscript> -<script type="text/javascript"> -document.write('<div class="topButton" style="display:none;"><a href="#top"><i class="fa fa-chevron-up" aria-hidden="true"></i></a></div>'); -</script> -<a id="top"></a> -  <nav class="navbar navbar-default navbar-secondary"> <div class="container-fluid">

1 0

[atlas/master] index: Fix jQuery import
by irl＠torproject.org 14 Nov '17

14 Nov '17

commit f57a57104e31fdd0c6343594a592857e995de00e Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Nov 14 11:00:03 2017 +0000 index: Fix jQuery import --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index b317559..4d99797 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@ <meta name="msapplication-square310x310logo" content="https://metrics.torproject.org/images/largetile.png">  - <script src="js/jquery-3.2.1.min.js"></script> + <script src="https://metrics.torproject.org/js/jquery-3.2.1.min.js"></script>  <link rel="stylesheet" href="css/bootstrap.min.css">

1 0