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

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 7d3883d0846a254b755316d4ca1f0f3b8250b8c9 Merge: a0a4f8a 5298ab5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 15:11:23 2017 -0500 Merge branch 'maint-0.3.0' src/or/entrynodes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 5298ab59170be74aed20e04e5378ec66eef6476e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 15:02:16 2017 -0500 Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min In that chutney test, the bridge client is configured to connect to the same bridge at 127.0.0.1:5003 _and_ at [::1]:5003, with no change in transports. That meant, I think, that the descriptor is only assigned to the first bridge when it arrives, and never the second. --- src/or/entrynodes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 729e4b0..c3c576c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3365,7 +3365,14 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) * guards in our list, since these are the guards that we typically use for * circuits. */ num_primary_to_check = get_n_primary_guards_to_use(GUARD_USAGE_TRAFFIC); - num_primary_to_check++; + /* + We had added this to try to guarantee that we'd not normally try a guard + without a descriptor, even if we didn't use the first guard. But it led + to problems with the chutney bridges+ipv6-min test. A better solution is + needed. + + num_primary_to_check++; + */ SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { entry_guard_consider_retry(guard);

1 0

[tor/release-0.3.0] Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 5298ab59170be74aed20e04e5378ec66eef6476e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 15:02:16 2017 -0500 Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min In that chutney test, the bridge client is configured to connect to the same bridge at 127.0.0.1:5003 _and_ at [::1]:5003, with no change in transports. That meant, I think, that the descriptor is only assigned to the first bridge when it arrives, and never the second. --- src/or/entrynodes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 729e4b0..c3c576c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3365,7 +3365,14 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) * guards in our list, since these are the guards that we typically use for * circuits. */ num_primary_to_check = get_n_primary_guards_to_use(GUARD_USAGE_TRAFFIC); - num_primary_to_check++; + /* + We had added this to try to guarantee that we'd not normally try a guard + without a descriptor, even if we didn't use the first guard. But it led + to problems with the chutney bridges+ipv6-min test. A better solution is + needed. + + num_primary_to_check++; + */ SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { entry_guard_consider_retry(guard);

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 4ed142ae9bb42f741b3626f83f89bc3a39af6a33 Merge: 92944a6 5298ab5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 15:04:15 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 src/or/entrynodes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 5298ab59170be74aed20e04e5378ec66eef6476e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 15:02:16 2017 -0500 Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min In that chutney test, the bridge client is configured to connect to the same bridge at 127.0.0.1:5003 _and_ at [::1]:5003, with no change in transports. That meant, I think, that the descriptor is only assigned to the first bridge when it arrives, and never the second. --- src/or/entrynodes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 729e4b0..c3c576c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3365,7 +3365,14 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) * guards in our list, since these are the guards that we typically use for * circuits. */ num_primary_to_check = get_n_primary_guards_to_use(GUARD_USAGE_TRAFFIC); - num_primary_to_check++; + /* + We had added this to try to guarantee that we'd not normally try a guard + without a descriptor, even if we didn't use the first guard. But it led + to problems with the chutney bridges+ipv6-min test. A better solution is + needed. + + num_primary_to_check++; + */ SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { entry_guard_consider_retry(guard);

1 0

[atlas/master] Update broken links on about page (patch from #21591)
by irl＠torproject.org 01 Mar '17

01 Mar '17

commit 1346f0d5ad1d4036079c026119c4d51fdbc9e14f Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Mar 1 19:36:21 2017 +0000 Update broken links on about page (patch from #21591) --- templates/about.html | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/templates/about.html b/templates/about.html index c5de6ff..fbe08e8 100644 --- a/templates/about.html +++ b/templates/about.html @@ -53,23 +53,22 @@ The historical data of a relay's bandwidth usage is available in graph form. <div class="span4"> <h2>Pure Client Side</h2> <p> -This application is built in a way that all the logic is delegated to the client. -This means that the amount of requests made to the server can be minimized and that -this application can potentially run by being loaded locally. The server is only -interrogated for JSON objects that do not manipulate the DOM of the page. -The protocol used for retrieving relay data is called Onionoo you can learn -<a href="https://onionoo.torproject.org/">more about Onionoo here</a> -and see <a href="https://onionoo.torproject.org/protocol.html">the protocol details here</a>. +This application is built in a way that all the logic is delegated to +the client. This means that the amount of requests made to the server +can be minimized and that this application can potentially run by +being loaded locally. The server is only interrogated for JSON objects +that do not manipulate the DOM of the page. The protocol used for +retrieving relay data is called <a href="https://onionoo.torproject.org/">Onionoo</a>. </p> </div> <div class="span4"> <h2>Libraries</h2> <p> -Atlas uses <a href="http://documentcloud.github.com/backbone/">Backbone.js</a> as an MV* framework, with <a href="http://requirejs.org/">require.js</a> for AMD loading of -dependencies. <a href="http://jquery.com/">jQuery</a> and <a href="http://documentcloud.github.com/underscore/">Underscore.js</a> as JS utility libraries. -<a href="http://datatables.net/">Datatables</a> for visualizing data in tabular form with custom filtering. <a href="http://d3js.org/">D3.js</a> for making pretty charts. -<a href="http://twitter.github.com/bootstrap/">Bootstrap</a> as a CSS framework. +Atlas uses <a href="http://backbonejs.org/">Backbone.js</a> as an MV* framework, with <a href="http://requirejs.org/">require.js</a> for AMD loading of +dependencies. <a href="http://jquery.com/">jQuery</a> and <a href="http://underscorejs.org/">Underscore.js</a> as JS utility libraries. +<a href="http://datatables.net/">Datatables</a> for visualizing data in tabular form with custom filtering. <a href="http://d3js.org">D3.js</a> for making pretty charts. +<a href="http://getbootstrap.com/">Bootstrap</a> as a CSS framework. </p> </div>

1 0

[atlas/master] Merge branch 'task/21459'
by irl＠torproject.org 01 Mar '17

01 Mar '17

commit ad65a827cbf9d488cba073a6130dfeec81089bbd Merge: dcc790d c79045d Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Mar 1 17:44:12 2017 +0000 Merge branch 'task/21459' css/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --cc css/style.css index efc5cd5,3056985..0178d57 --- a/css/style.css +++ b/css/style.css @@@ -67,7 -67,11 +67,16 @@@ span.flags img text-align:left; } +#outdatedData > div { + position:relative; + top:60px; +} ++ + dd { + margin-left: 0; + margin-bottom: 1.2em; + } + + pre { + padding: 5px; + }

1 0

[atlas/master] show fingerprint in one line on default tor browser size
by irl＠torproject.org 01 Mar '17

01 Mar '17

commit c79045d18d89ef4fd4acca974f21f81edcbfff13 Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Wed Mar 1 10:46:21 2017 +0100 show fingerprint in one line on default tor browser size --- css/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/css/style.css b/css/style.css index 3c67c24..3056985 100644 --- a/css/style.css +++ b/css/style.css @@ -66,3 +66,12 @@ span.flags img { .tooltip * { text-align:left; } + +dd { + margin-left: 0; + margin-bottom: 1.2em; +} + +pre { + padding: 5px; +}

1 0

[atlas/master] Remove disallowed element attributes
by irl＠torproject.org 01 Mar '17

01 Mar '17

commit dcc790ded38aacada05217ea7b2f9efca4ef92c1 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Feb 10 09:25:15 2017 +0000 Remove disallowed element attributes Removing these attributes shows no rendering differences. Found using the W3C markup validator service bookmarklet. Closes #21352. --- js/views/details/main.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/js/views/details/main.js b/js/views/details/main.js index 9006c94..f95e015 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -138,9 +138,7 @@ define([ /* Add a legend. */ var legend = svg.append("g") - .attr("class", "legend") - .attr("x", width - 65) - .attr("y", 25); + .attr("class", "legend"); legend.selectAll("g").data(data) .enter().append("g") .each(function(d, i) { @@ -155,8 +153,6 @@ define([ g.append("svg:text") .attr("x", legendPos[i][0] - margin.left + 15) .attr("y", legendPos[i][1] - margin.top + 14) - .attr("height", 30) - .attr("width", 100) .style("fill", colors[i]) .style("font-family", "Helvetica") .style("font-size", "12px")

1 0

[atlas/master] Add time interval AFTER drawing a data point (Fixes: #20802)
by irl＠torproject.org 01 Mar '17

01 Mar '17

commit f8bccdc9d126507b7aa4f882899354b0d72673ed Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Wed Feb 1 12:09:42 2017 +0100 Add time interval AFTER drawing a data point (Fixes: #20802) --- js/models/graph.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/models/graph.js b/js/models/graph.js index ca36d48..1f356db 100644 --- a/js/models/graph.js +++ b/js/models/graph.js @@ -19,7 +19,6 @@ define([ var y = first.getTime(); _.each(history[period].values, function(value, i) { - y += history[period].interval*1000; var x = null if (value != null) { x = value*history[period].factor; @@ -32,6 +31,7 @@ define([ var mperiod = "bw_" + period.split("_")[1] var newar = model.get(mperiod)[name]; newar.push([y,x]); + y += history[period].interval*1000; }); }); return newar; @@ -47,7 +47,6 @@ define([ time[0], time[1], time[2]); var y = first.getTime(); _.each(history[period].values, function(value, i) { - y += history[period].interval*1000; var x = null if (value != null) { x = value*history[period].factor; @@ -55,6 +54,7 @@ define([ var mperiod = "weights_" + period.split("_")[1] newar = model.get(mperiod)[name]; newar.push([y,x]); + y += history[period].interval*1000; }); }); return newar; @@ -70,7 +70,6 @@ define([ time[0], time[1], time[2]); var y = first.getTime(); _.each(history[period].values, function(value, i) { - y += history[period].interval*1000; var x = null if (value != null) { x = value*history[period].factor; @@ -78,6 +77,7 @@ define([ var mperiod = "clients_" + period.split("_")[1] newar = model.get(mperiod)[name]; newar.push([y,x]); + y += history[period].interval*1000; }); }); return newar;

1 0