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

[atlas/master] Use Source Sans Pro for graph per style guide
by irl＠torproject.org 17 Dec '17

17 Dec '17

commit a8ed45d20f747ab80b5f6cf6911cc913fd625c2c Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Dec 17 11:46:34 2017 +0000 Use Source Sans Pro for graph per style guide --- js/views/aggregate/map.js | 1 - js/views/details/main.js | 3 --- 2 files changed, 4 deletions(-) diff --git a/js/views/aggregate/map.js b/js/views/aggregate/map.js index 1e1bca4..9789913 100644 --- a/js/views/aggregate/map.js +++ b/js/views/aggregate/map.js @@ -112,7 +112,6 @@ define([ svg.append("text") .attr("x", 30) .attr("y", height-(i*5+0.5)*20 ) - .style("font-family", "Helvetica") .style("font-size", "12px") .style("fill", "#484848") .text("" + (Math.pow(i,2)* maximum_value*100).toFixed(3) + "%"); diff --git a/js/views/details/main.js b/js/views/details/main.js index 7f0770f..221b9c0 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -66,7 +66,6 @@ define([ xAxisContainer.selectAll("minor") .style("stroke-opacity", .5); xAxisContainer.selectAll("text") - .style("font-family", "Helvetica") .style("font-size", "12px"); /* Add the y axis. */ @@ -86,7 +85,6 @@ define([ yAxisContainer.selectAll("minor") .style("stroke-opacity", .5); yAxisContainer.selectAll("text") - .style("font-family", "Helvetica") .style("font-size", "12px"); /* Add one group per data line. */ @@ -150,7 +148,6 @@ define([ .attr("x", legendPos[i][0] - margin.left + 15) .attr("y", legendPos[i][1] - margin.top + 14) .style("fill", colors[i]) - .style("font-family", "Helvetica") .style("font-size", "12px") .text(labels[i]); });

1 0

[atlas/master] Improves the advanced search form for aggregated queries (Fixes: #24507)
by irl＠torproject.org 17 Dec '17

17 Dec '17

commit 9a4afc84a64c52bcb1dff4ab0324aea5af69e9c1 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Dec 17 19:23:12 2017 +0000 Improves the advanced search form for aggregated queries (Fixes: #24507) * Empty search forms will cause aggregations to be performed on the whole network. * Added an AS+CC aggregation button to allow to aggregate by both for the entire network. --- js/views/search/main.js | 20 ++++++++++++-------- templates/search/main.html | 3 ++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/js/views/search/main.js b/js/views/search/main.js index 5ad2a1d..58d6401 100644 --- a/js/views/search/main.js +++ b/js/views/search/main.js @@ -72,22 +72,26 @@ define([ return false; }); - $("#do-advanced-aggregation").bind('click', function(){ + var goAggregate = function(type) { var query = buildAdvancedQuery(); - document.location = "#aggregate/all/"+encodeURI(query); + document.location = "#aggregate/" + type + ((query) ? "/" + encodeURI(query) : ""); return false; + } + + $("#do-advanced-aggregation").bind('click', function(){ + return goAggregate("all") }); $("#do-advanced-aggregation-cc").bind('click', function(){ - var query = buildAdvancedQuery(); - document.location = "#aggregate/cc/"+encodeURI(query); - return false; + return goAggregate("cc") }); $("#do-advanced-aggregation-as").bind('click', function(){ - var query = buildAdvancedQuery(); - document.location = "#aggregate/as/"+encodeURI(query); - return false; + return goAggregate("as") + }); + + $("#do-advanced-aggregation-ascc").bind('click', function(){ + return goAggregate("ascc") }); $("#home-advanced-search").bind('submit', function(){ diff --git a/templates/search/main.html b/templates/search/main.html index c72158e..5c48a77 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -130,8 +130,9 @@ or exit relay filtered by the search parameters.</p> <p><button id="do-advanced" class="btn btn-primary" type="submit">Advanced Search</button></p> <p> <button id="do-advanced-aggregation" class="btn btn-primary" type="button">Advanced Aggregation</button> - <button id="do-advanced-aggregation-cc" class="btn btn-secondary tip" type="button" title="Aggregate by Country">by CC</button> <button id="do-advanced-aggregation-as" class="btn btn-secondary tip" type="button" title="Aggregate by Autonomous System">by AS</button> + <button id="do-advanced-aggregation-cc" class="btn btn-secondary tip" type="button" title="Aggregate by Country">by CC</button> + <button id="do-advanced-aggregation-ascc" class="btn btn-secondary tip" type="button" title="Aggregate by Autonomous System">by AS+CC</button> </p> </form> <p><sup>&dagger;</sup> These options are ignored when performing an aggregation as the aggregated searches are restricted to only currently running relays.</p>

1 0

[atlas/master] Switch flags icons to use new Tor icons (See: #24399)
by irl＠torproject.org 17 Dec '17

17 Dec '17

commit b45a1c4e93411d9d5f410386be0f6ad5eb733a7f Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Dec 17 11:53:16 2017 +0000 Switch flags icons to use new Tor icons (See: #24399) --- img/flags/authority.png | Bin 0 -> 325 bytes img/flags/award_stroke_8x16.png | Bin 186 -> 0 bytes img/flags/badexit.png | Bin 0 -> 403 bytes img/flags/bolt_16x16.png | Bin 206 -> 0 bytes img/flags/book_14x16.png | Bin 181 -> 0 bytes img/flags/book_alt_16x16.png | Bin 180 -> 0 bytes img/flags/bridge.png | Bin 0 -> 273 bytes img/flags/cd_16x16.png | Bin 210 -> 0 bytes img/flags/check_alt_16x16.png | Bin 223 -> 0 bytes img/flags/cloud_download_16x16.png | Bin 224 -> 0 bytes img/flags/cog_16x16.png | Bin 236 -> 0 bytes img/flags/country.png | Bin 0 -> 291 bytes img/flags/denied_16x16.png | Bin 244 -> 0 bytes img/flags/exit.png | Bin 0 -> 321 bytes img/flags/fallbackdir.png | Bin 0 -> 458 bytes img/flags/fast.png | Bin 0 -> 295 bytes img/flags/fingerprint.png | Bin 0 -> 455 bytes img/flags/fork_14x16.png | Bin 200 -> 0 bytes img/flags/guard.png | Bin 0 -> 371 bytes img/flags/hibernating.png | Bin 0 -> 303 bytes img/flags/hsdir.png | Bin 0 -> 479 bytes img/flags/info_8x16.png | Bin 170 -> 0 bytes img/flags/ipv4.png | Bin 0 -> 396 bytes img/flags/ipv6.png | Bin 0 -> 406 bytes img/flags/ipv6exit.png | Bin 0 -> 364 bytes img/flags/noedconsensus.png | Bin 0 -> 350 bytes img/flags/notrecommended.png | Bin 0 -> 381 bytes img/flags/onion-alt.png | Bin 0 -> 411 bytes img/flags/onion.png | Bin 0 -> 352 bytes img/flags/question_mark_8x16.png | Bin 210 -> 0 bytes img/flags/reachableipv4.png | Bin 0 -> 370 bytes img/flags/reachableipv6.png | Bin 0 -> 394 bytes img/flags/relay.png | Bin 0 -> 357 bytes img/flags/running.png | Bin 0 -> 244 bytes img/flags/share_16x16.png | Bin 210 -> 0 bytes img/flags/spin_14x16.png | Bin 243 -> 0 bytes img/flags/stable.png | Bin 0 -> 349 bytes img/flags/star_16x16.png | Bin 244 -> 0 bytes img/flags/tshirt.png | Bin 0 -> 321 bytes img/flags/unmeasured.png | Bin 0 -> 318 bytes img/flags/unreachableipv4.png | Bin 0 -> 382 bytes img/flags/unreachableipv6.png | Bin 0 -> 402 bytes img/flags/v2dir-alt.png | Bin 0 -> 485 bytes img/flags/v2dir.png | Bin 0 -> 280 bytes img/flags/valid.png | Bin 0 -> 373 bytes img/properties/fallbackdir_16x16.png | Bin 247 -> 0 bytes img/properties/ipv6_exit_16x16.png | Bin 470 -> 0 bytes img/properties/ipv6_or_16x16.png | Bin 444 -> 0 bytes img/properties/ipv6_or_unreachable_16x16.png | Bin 518 -> 0 bytes img/properties/not_recommended_16x16.png | Bin 323 -> 0 bytes img/properties/unmeasured_16x16.png | Bin 199 -> 0 bytes js/models/relay.js | 47 ++++++++++++--------------- templates/details/bridge.html | 2 +- templates/details/router.html | 2 +- templates/search/do.html | 2 +- 55 files changed, 23 insertions(+), 30 deletions(-) diff --git a/img/flags/authority.png b/img/flags/authority.png new file mode 100644 index 0000000..ebd207b Binary files /dev/null and b/img/flags/authority.png differ diff --git a/img/flags/award_stroke_8x16.png b/img/flags/award_stroke_8x16.png deleted file mode 100644 index d9014d3..0000000 Binary files a/img/flags/award_stroke_8x16.png and /dev/null differ diff --git a/img/flags/badexit.png b/img/flags/badexit.png new file mode 100644 index 0000000..b5d8a73 Binary files /dev/null and b/img/flags/badexit.png differ diff --git a/img/flags/bolt_16x16.png b/img/flags/bolt_16x16.png deleted file mode 100644 index 2bc9544..0000000 Binary files a/img/flags/bolt_16x16.png and /dev/null differ diff --git a/img/flags/book_14x16.png b/img/flags/book_14x16.png deleted file mode 100644 index 54170f9..0000000 Binary files a/img/flags/book_14x16.png and /dev/null differ diff --git a/img/flags/book_alt_16x16.png b/img/flags/book_alt_16x16.png deleted file mode 100644 index 0fa8062..0000000 Binary files a/img/flags/book_alt_16x16.png and /dev/null differ diff --git a/img/flags/bridge.png b/img/flags/bridge.png new file mode 100644 index 0000000..a0cbfa6 Binary files /dev/null and b/img/flags/bridge.png differ diff --git a/img/flags/cd_16x16.png b/img/flags/cd_16x16.png deleted file mode 100644 index 4805b21..0000000 Binary files a/img/flags/cd_16x16.png and /dev/null differ diff --git a/img/flags/check_alt_16x16.png b/img/flags/check_alt_16x16.png deleted file mode 100644 index 3bd1002..0000000 Binary files a/img/flags/check_alt_16x16.png and /dev/null differ diff --git a/img/flags/cloud_download_16x16.png b/img/flags/cloud_download_16x16.png deleted file mode 100644 index f5d5f80..0000000 Binary files a/img/flags/cloud_download_16x16.png and /dev/null differ diff --git a/img/flags/cog_16x16.png b/img/flags/cog_16x16.png deleted file mode 100644 index a72b619..0000000 Binary files a/img/flags/cog_16x16.png and /dev/null differ diff --git a/img/flags/country.png b/img/flags/country.png new file mode 100644 index 0000000..9eda2b2 Binary files /dev/null and b/img/flags/country.png differ diff --git a/img/flags/denied_16x16.png b/img/flags/denied_16x16.png deleted file mode 100644 index 4acbf6b..0000000 Binary files a/img/flags/denied_16x16.png and /dev/null differ diff --git a/img/flags/exit.png b/img/flags/exit.png new file mode 100644 index 0000000..6596e53 Binary files /dev/null and b/img/flags/exit.png differ diff --git a/img/flags/fallbackdir.png b/img/flags/fallbackdir.png new file mode 100644 index 0000000..0c25009 Binary files /dev/null and b/img/flags/fallbackdir.png differ diff --git a/img/flags/fast.png b/img/flags/fast.png new file mode 100644 index 0000000..7c65b9f Binary files /dev/null and b/img/flags/fast.png differ diff --git a/img/flags/fingerprint.png b/img/flags/fingerprint.png new file mode 100644 index 0000000..b1b1ebf Binary files /dev/null and b/img/flags/fingerprint.png differ diff --git a/img/flags/fork_14x16.png b/img/flags/fork_14x16.png deleted file mode 100644 index b000ca0..0000000 Binary files a/img/flags/fork_14x16.png and /dev/null differ diff --git a/img/flags/guard.png b/img/flags/guard.png new file mode 100644 index 0000000..1c55c39 Binary files /dev/null and b/img/flags/guard.png differ diff --git a/img/flags/hibernating.png b/img/flags/hibernating.png new file mode 100644 index 0000000..5e6e2d4 Binary files /dev/null and b/img/flags/hibernating.png differ diff --git a/img/flags/hsdir.png b/img/flags/hsdir.png new file mode 100644 index 0000000..19e3126 Binary files /dev/null and b/img/flags/hsdir.png differ diff --git a/img/flags/info_8x16.png b/img/flags/info_8x16.png deleted file mode 100644 index 1227d2f..0000000 Binary files a/img/flags/info_8x16.png and /dev/null differ diff --git a/img/flags/ipv4.png b/img/flags/ipv4.png new file mode 100644 index 0000000..d9e3de8 Binary files /dev/null and b/img/flags/ipv4.png differ diff --git a/img/flags/ipv6.png b/img/flags/ipv6.png new file mode 100644 index 0000000..1665726 Binary files /dev/null and b/img/flags/ipv6.png differ diff --git a/img/flags/ipv6exit.png b/img/flags/ipv6exit.png new file mode 100644 index 0000000..5603a4e Binary files /dev/null and b/img/flags/ipv6exit.png differ diff --git a/img/flags/noedconsensus.png b/img/flags/noedconsensus.png new file mode 100644 index 0000000..e68495c Binary files /dev/null and b/img/flags/noedconsensus.png differ diff --git a/img/flags/notrecommended.png b/img/flags/notrecommended.png new file mode 100644 index 0000000..f7a93d4 Binary files /dev/null and b/img/flags/notrecommended.png differ diff --git a/img/flags/onion-alt.png b/img/flags/onion-alt.png new file mode 100644 index 0000000..ace78cf Binary files /dev/null and b/img/flags/onion-alt.png differ diff --git a/img/flags/onion.png b/img/flags/onion.png new file mode 100644 index 0000000..e738fda Binary files /dev/null and b/img/flags/onion.png differ diff --git a/img/flags/question_mark_8x16.png b/img/flags/question_mark_8x16.png deleted file mode 100644 index 8059df9..0000000 Binary files a/img/flags/question_mark_8x16.png and /dev/null differ diff --git a/img/flags/reachableipv4.png b/img/flags/reachableipv4.png new file mode 100644 index 0000000..e929d87 Binary files /dev/null and b/img/flags/reachableipv4.png differ diff --git a/img/flags/reachableipv6.png b/img/flags/reachableipv6.png new file mode 100644 index 0000000..b4f6990 Binary files /dev/null and b/img/flags/reachableipv6.png differ diff --git a/img/flags/relay.png b/img/flags/relay.png new file mode 100644 index 0000000..ee171d4 Binary files /dev/null and b/img/flags/relay.png differ diff --git a/img/flags/running.png b/img/flags/running.png new file mode 100644 index 0000000..6d716cf Binary files /dev/null and b/img/flags/running.png differ diff --git a/img/flags/share_16x16.png b/img/flags/share_16x16.png deleted file mode 100644 index a0df554..0000000 Binary files a/img/flags/share_16x16.png and /dev/null differ diff --git a/img/flags/spin_14x16.png b/img/flags/spin_14x16.png deleted file mode 100644 index f19b912..0000000 Binary files a/img/flags/spin_14x16.png and /dev/null differ diff --git a/img/flags/stable.png b/img/flags/stable.png new file mode 100644 index 0000000..172e618 Binary files /dev/null and b/img/flags/stable.png differ diff --git a/img/flags/star_16x16.png b/img/flags/star_16x16.png deleted file mode 100644 index 3b3952d..0000000 Binary files a/img/flags/star_16x16.png and /dev/null differ diff --git a/img/flags/tshirt.png b/img/flags/tshirt.png new file mode 100644 index 0000000..46384f0 Binary files /dev/null and b/img/flags/tshirt.png differ diff --git a/img/flags/unmeasured.png b/img/flags/unmeasured.png new file mode 100644 index 0000000..8b0e43a Binary files /dev/null and b/img/flags/unmeasured.png differ diff --git a/img/flags/unreachableipv4.png b/img/flags/unreachableipv4.png new file mode 100644 index 0000000..497d4c6 Binary files /dev/null and b/img/flags/unreachableipv4.png differ diff --git a/img/flags/unreachableipv6.png b/img/flags/unreachableipv6.png new file mode 100644 index 0000000..db44b88 Binary files /dev/null and b/img/flags/unreachableipv6.png differ diff --git a/img/flags/v2dir-alt.png b/img/flags/v2dir-alt.png new file mode 100644 index 0000000..a68b7ee Binary files /dev/null and b/img/flags/v2dir-alt.png differ diff --git a/img/flags/v2dir.png b/img/flags/v2dir.png new file mode 100644 index 0000000..c330702 Binary files /dev/null and b/img/flags/v2dir.png differ diff --git a/img/flags/valid.png b/img/flags/valid.png new file mode 100644 index 0000000..6de0737 Binary files /dev/null and b/img/flags/valid.png differ diff --git a/img/properties/fallbackdir_16x16.png b/img/properties/fallbackdir_16x16.png deleted file mode 100644 index dc05f4f..0000000 Binary files a/img/properties/fallbackdir_16x16.png and /dev/null differ diff --git a/img/properties/ipv6_exit_16x16.png b/img/properties/ipv6_exit_16x16.png deleted file mode 100644 index e47a791..0000000 Binary files a/img/properties/ipv6_exit_16x16.png and /dev/null differ diff --git a/img/properties/ipv6_or_16x16.png b/img/properties/ipv6_or_16x16.png deleted file mode 100644 index f6c4dc3..0000000 Binary files a/img/properties/ipv6_or_16x16.png and /dev/null differ diff --git a/img/properties/ipv6_or_unreachable_16x16.png b/img/properties/ipv6_or_unreachable_16x16.png deleted file mode 100644 index a17333c..0000000 Binary files a/img/properties/ipv6_or_unreachable_16x16.png and /dev/null differ diff --git a/img/properties/not_recommended_16x16.png b/img/properties/not_recommended_16x16.png deleted file mode 100644 index b8a3634..0000000 Binary files a/img/properties/not_recommended_16x16.png and /dev/null differ diff --git a/img/properties/unmeasured_16x16.png b/img/properties/unmeasured_16x16.png deleted file mode 100644 index 9db7a5e..0000000 Binary files a/img/properties/unmeasured_16x16.png and /dev/null differ diff --git a/js/models/relay.js b/js/models/relay.js index 1204544..813030d 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -10,49 +10,43 @@ define([ var relayModel = Backbone.Model.extend({ baseurl: 'https://onionoo.torproject.org', fingerprint: '', - parseflags: function(flags, size) { + parseflags: function(flags) { var output = []; var model = this; _.each(flags, function(flag) { if (flag == "Authority") { - output.push([flag,"award_stroke_"+size[2], "This relay is a directory authority."]); + output.push([flag, "authority", "This relay is a directory authority."]); } if (flag == "BadExit") { model.set({badexit: true}); - output.push([flag, "denied_"+size[0], "This relay is believed to be useless as an exit node (because its ISP censors it, because it is behind a restrictive proxy, or for some similar reason)."]); + output.push([flag, "badexit", "This relay is believed to be useless as an exit node (because its ISP censors it, because it is behind a restrictive proxy, or for some similar reason)."]); } if (flag == "Fast") { - output.push([flag,"bolt_"+size[0], "This relay is suitable for high-bandwidth circuits."]); + output.push([flag, "fast", "This relay is suitable for high-bandwidth circuits."]); } if (flag == "Guard") { - output.push([flag,"share_"+size[0], "This relay is suitable for use as an entry guard."]); + output.push([flag, "guard", "This relay is suitable for use as an entry guard."]); } if (flag == "HSDir") { - output.push([flag,"book_alt_"+size[0], "This relay is considered a v2 hidden service directory."]); - } - if (flag == "Named") { - output.push([flag,"info_"+size[2], "This relay's identity-nickname mapping is canonical, and this authority binds names."]); + output.push([flag, "hsdir", "This relay is considered a v2 hidden service directory."]); } if (flag == "NoEdConsensus") { - output.push([flag,"question_mark_"+size[2], "An Ed25519 key in the relay's descriptor or microdesriptor does not reflect authority consensus."]); + output.push([flag, "noedconensus", "An Ed25519 key in the relay's descriptor or microdesriptor does not reflect authority consensus."]); } if (flag == "Running") { - output.push([flag,"fork_"+size[1], "This relay is currently usable."]); + output.push([flag, "running", "This relay is currently usable."]); } if (flag == "Stable") { - output.push([flag,"cd_"+size[0], "This relay is suitable for long-lived circuits."]); + output.push([flag, "stable", "This relay is suitable for long-lived circuits."]); } if (flag == "V2Dir") { - output.push([flag,"book_"+size[1], "This relay implements the v2 directory protocol or higher."]); + output.push([flag, "v2dir-alt", "This relay implements the v2 directory protocol or higher."]); } if (flag == "Valid") { - output.push([flag,"check_alt_"+size[0], "This relay has been 'validated'."]); - } - if (flag == "Unnamed") { - output.push([flag,"question_mark_"+size[2], "Another relay has bound the name used by this relay, and this authority binds names."]); + output.push([flag, "valid", "This relay has been 'validated'."]); } if (flag == "Exit") { - output.push([flag,"cloud_download_"+size[0], "This relay is more useful for building general-purpose exit circuits than for relay circuits."]); + output.push([flag, "exit", "This relay is more useful for building general-purpose exit circuits than for relay circuits."]); } }); return output; @@ -62,19 +56,19 @@ define([ var model = this; _.each(flags, function(flag) { if (flag == "Not Recommended") { - output.push([flag,"not_recommended_16x16", "This relay is running a Tor version that is not recommended by the directory authorities and may contain known issues."]); + output.push([flag,"notrecommended", "This relay is running a Tor version that is not recommended by the directory authorities and may contain known issues."]); } if (flag == "Unmeasured") { - output.push([flag,"unmeasured_16x16", "This relay has not been measured by at least 3 bandwidth authorities and so its consensus weight is currently capped. This is expected for new relays."]); + output.push([flag,"unmeasured", "This relay has not been measured by at least 3 bandwidth authorities and so its consensus weight is currently capped. This is expected for new relays."]); } if (flag == "FallbackDir") { - output.push([flag,"fallbackdir_16x16", "Tor clients contact fallback directory mirrors during bootstrap, and download the consensus and authority certificates from them. We include a default list of mirrors in the Tor source code. These default mirrors need to be long-term stable, and on the same IPv4 and IPv6 addresses and ports."]); + output.push([flag,"fallbackdir", "Tor clients contact fallback directory mirrors during bootstrap, and download the consensus and authority certificates from them. We include a default list of mirrors in the Tor source code. These default mirrors need to be long-term stable, and on the same IPv4 and IPv6 addresses and ports."]); } - if (flag == "IPv6 ORPort") { - output.push([flag,"ipv6_or_16x16", "This relay accepts OR connections using IPv6."]); + if (flag == "ReachableIPv6") { + output.push([flag,"reachableipv6", "This relay accepts OR connections using IPv6."]); } if (flag == "IPv6 Exit") { - output.push([flag,"ipv6_exit_16x16", "This relay allows exit connections using IPv6."]); + output.push([flag, "ipv6exit", "This relay allows exit connections using IPv6."]); } }); return output; @@ -223,15 +217,14 @@ define([ relay.transports = relay.transports ? relay.transports : null; relay.fingerprint = relay.hashed_fingerprint ? relay.hashed_fingerprint : relay.fingerprint; model.set({badexit: false}); - var size = ['16x16', '14x16', '8x16']; - relay.flags = model.parseflags(relay.flags, size); + relay.flags = model.parseflags(relay.flags); /* Synthetic Additional Flags */ var additional_flags = [] if (!((typeof relay.recommended_version !== 'undefined') ? relay.recommended_version : true)) additional_flags.push("Not Recommended"); if (!((typeof relay.measured !== 'undefined') ? relay.measured : true)) additional_flags.push("Unmeasured"); if (IsFallbackDir(relay.fingerprint)) additional_flags.push("FallbackDir"); - if (relay.or_v6_addresses.length > 0) additional_flags.push("IPv6 ORPort"); + if (relay.or_v6_addresses.length > 0) additional_flags.push("ReachableIPv6"); if (relay.exit_policy_v6_summary !== null) additional_flags.push("IPv6 Exit"); relay.additional_flags = model.parseadditionalflags(additional_flags); diff --git a/templates/details/bridge.html b/templates/details/bridge.html index e74ce93..66fa8c1 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -61,7 +61,7 @@ <% var propertyCount = 0; %> <% _.each(relay.get('additional_flags'), function(flag) { propertyCount++; %> <span class="tip flags" title="<%= flag[2] %>"> - <img class="inline" alt="" src="img/properties/<%= flag[1] %>.png"/> + <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <span class="inline"><%= flag[0] %></span> </span> <% }); %> diff --git a/templates/details/router.html b/templates/details/router.html index 2aea6b2..b92d6ad 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -124,7 +124,7 @@ <% var propertyCount = 0; %> <% _.each(relay.get('additional_flags'), function(flag) { propertyCount++; %> <span class="tip flags" title="<%= flag[2] %>"> - <img class="inline" alt="" src="img/properties/<%= flag[1] %>.png"/> + <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <span class="inline"><%= flag[0] %></span> </span> <% }); %> diff --git a/templates/search/do.html b/templates/search/do.html index 5575c4c..7f98106 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -104,7 +104,7 @@ <% _.each(relay.get('flags'), function(flag) { %><img class="tip flags" src="img/flags/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %><br /><%= flag[2] %>"/><% }); %> </td> <td> - <% _.each(relay.get('additional_flags'), function(flag) { %><img class="tip flags" src="img/properties/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %><br /><%= flag[2] %>"/><% }); %> + <% _.each(relay.get('additional_flags'), function(flag) { %><img class="tip flags" src="img/flags/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %><br /><%= flag[2] %>"/><% }); %> </td> <td><%= relay.get('or_port') %></td> <td><%= relay.get('dir_port') %></td>

1 0

[atlas/master] Fixes labels in advanced search form
by irl＠torproject.org 17 Dec '17

17 Dec '17

commit 345bad55ff3fb01394c6bef5d2a4c35d4e7aeae2 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Dec 17 19:10:37 2017 +0000 Fixes labels in advanced search form --- templates/search/main.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/search/main.html b/templates/search/main.html index 9af49ae..c72158e 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -58,7 +58,7 @@ or exit relay filtered by the search parameters.</p> </div> </div> <div class="form-group"> - <label for="advanced-search-nickname">Contact:</label> + <label for="advanced-search-contact">Contact:</label> <input type="text" class="form-control search-query" autocorrect="off" autocapitalize="off" id="advanced-search-contact"> </div> <div class="form-group"> @@ -98,11 +98,11 @@ or exit relay filtered by the search parameters.</p> <input type="text" class="form-control search-query" autocorrect="off" autocapitalize="off" id="advanced-search-hostname"> </div> <div class="form-group"> - <label>First Seen:</label><br> + <label for="advanced-search-first-seen-from">First Seen:</label><br> From <input type="number" id="advanced-search-first-seen-from" class="form-control day-spinner" value="0"> to <input type="number" id="advanced-search-first-seen-to" class="form-control day-spinner" value="0"> days ago </div> <div class="form-group"> - <label>Last Seen:</label><br> + <label for="advanced-search-last-seen-from">Last Seen:</label><br> From <input type="number" id="advanced-search-last-seen-from" class="form-control day-spinner" value="0"> to <input type="number" id="advanced-search-last-seen-to" class="form-control day-spinner" value="0"> days ago </div> <div class="form-group"> @@ -110,7 +110,7 @@ or exit relay filtered by the search parameters.</p> <input type="text" class="form-control search-query" autocorrect="off" autocapitalize="off" id="advanced-search-version"> </div> <div class="form-group"> - <label for="advanced-search-flag">Type<sup>&dagger;</sup>:</label> + <label for="advanced-search-type">Type<sup>&dagger;</sup>:</label> <select class="form-control" id="advanced-search-type"> <option value="">Any</option> <option value="relay">Only Relays</option> @@ -118,7 +118,7 @@ or exit relay filtered by the search parameters.</p> </select> </div> <div class="form-group"> - <label for="advanced-search-flag">Running<sup>&dagger;</sup>:</label> + <label for="advanced-search-running">Running<sup>&dagger;</sup>:</label> <select class="form-control" id="advanced-search-running"> <option value="">Any</option> <option value="true">Only Running Relays</option>

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 17 Dec '17

17 Dec '17

commit 8c3e3d98904a6621e3f4b0be93cdccbc7be70d92 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 17 14:16:24 2017 +0000 Update translations for torbirdy_completed --- sv/torbirdy.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd index 44d0e74b3..b0940c2ea 100644 --- a/sv/torbirdy.dtd +++ b/sv/torbirdy.dtd @@ -38,6 +38,8 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Lägg inte till mottagarnas nyckel-IDn i krypterade meddelanden [standard: lägg till]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Stäng av okryperade mejl huvud [Förinställt som påslaget]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Bekräfta innan e-post skickas om Enigmail är aktiverat [standard: bekräfta inte]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Aktivera Thunderbirds automatiska e-post inställningsguide [standard: inaktiverad]">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 17 Dec '17

17 Dec '17

commit 218b0d2f2931a416516d0dc69eb3fc815d9a68d3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 17 14:16:15 2017 +0000 Update translations for torbirdy --- sv/torbirdy.dtd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd index 3779f5299..b0940c2ea 100644 --- a/sv/torbirdy.dtd +++ b/sv/torbirdy.dtd @@ -38,9 +38,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Lägg inte till mottagarnas nyckel-IDn i krypterade meddelanden [standard: lägg till]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> -<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Stäng av okryperade mejl huvud [Förinställt som påslaget]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Bekräfta innan e-post skickas om Enigmail är aktiverat [standard: bekräfta inte]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[doctor/master] Daemon to check wiki for outdated package versions
by atagar＠torproject.org 17 Dec '17

17 Dec '17

commit 6cdacb303466a175dc5094c642f4f3bc52e6e784 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 16 18:28:32 2017 -0800 Daemon to check wiki for outdated package versions Script to help me keep the packages wiki up to date... https://trac.torproject.org/projects/tor/wiki/doc/packages Presently this prints a table. Remaining work is to have it email me and support gentoo. --- package_versions.py | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/package_versions.py b/package_versions.py new file mode 100755 index 0000000..e7030db --- /dev/null +++ b/package_versions.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python +# Copyright 2017, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Checks for outdated versions on the packages wiki... + + https://trac.torproject.org/projects/tor/wiki/doc/packages +""" + +import collections +import re +import ssl +import urllib2 + +DEBIAN_VERSION = '<h1>Package: \S+ $([0-9\.]+).*$' +FEDORA_VERSION = '<div class="package-name">([0-9\.]+).*</div>' +ARCH_LINUX_VERSION = '<title>Arch Linux - \S+ ([0-9\.]+).*</title>' +AUR_VERSION = '<h2>Package Details: \S+ ([0-9\.]+)-\S+</h2>' +FREEBSD_VERSION = 'SHA256 $\S+-([0-9\.]+).tar.gz$' +OPENBSD_DIST_VERSION = 'DISTNAME\s*=\s+\S+-([0-9\.]+)' +OPENBSD_EGG_VERSION = 'MODPY_EGG_VERSION =\s+([0-9\.]+)' +NETBSD_VERSION = 'CURRENT, <b>Version: </b>([0-9\.]+),' + +COLUMN = '| %-10s | %-10s | %-10s | %-50s |' +DIV = '+%s+%s+%s+%s+' % ('-' * 12, '-' * 12, '-' * 12, '-' * 52) + +Package = collections.namedtuple('Package', ['platform', 'url', 'version', 'regex']) + +PACKAGES = [ + ('tor', [ + Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/tor…', '0.3.1.9', 'tor-([0-9\.]+).tar.gz'), + Package('debian', 'https://packages.debian.org/sid/tor', '0.3.1.9', DEBIAN_VERSION), + Package('fedora', 'https://apps.fedoraproject.org/packages/tor', '0.3.1.9', FEDORA_VERSION), + #Package('gentoo', 'https://packages.gentoo.org/packages/net-vpn/tor', '0.3.1.9', None), + Package('archlinux', 'https://www.archlinux.org/packages/community/x86_64/tor/', '0.3.1.9', ARCH_LINUX_VERSION), + Package('slackware', 'https://slackbuilds.org/repository/14.2/network/tor/', '0.3.1.9', 'tor-([0-9\.]+).tar.gz'), + Package('freebsd', 'https://www.freshports.org/security/tor/', '0.3.1.9', FREEBSD_VERSION), + Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/Makefile?rev=HEAD&c…', '0.3.1.9', OPENBSD_DIST_VERSION), + Package('netbsd', 'http://pkgsrc.se/net/tor', '0.3.1.9', NETBSD_VERSION), + ]), + ('nyx', [ + #Package('gentoo', 'https://packages.gentoo.org/packages/net-misc/nyx', '2.0.4', None), + Package('archlinux', 'https://aur.archlinux.org/packages/nyx/', '2.0.4', AUR_VERSION), + Package('slackware', 'https://slackbuilds.org/repository/14.2/python/nyx/', '2.0.4', 'nyx-([0-9\.]+).tar.gz'), + Package('freebsd', 'https://www.freshports.org/security/nyx/', '2.0.4', FREEBSD_VERSION), + Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/nyx/Makefile?rev=HEAD&c…', '2.0.4', OPENBSD_EGG_VERSION), + ]), + ('stem', [ + Package('debian', 'https://packages.debian.org/sid/python-stem', '1.6.0', DEBIAN_VERSION), + Package('fedora', 'https://apps.fedoraproject.org/packages/python-stem', '1.6.0', FEDORA_VERSION), + #Package('gentoo', 'https://packages.gentoo.org/packages/net-libs/stem', '1.6.0', None), + Package('archlinux', 'https://aur.archlinux.org/packages/stem/', '1.6.0', AUR_VERSION), + Package('slackware', 'https://slackbuilds.org/repository/14.2/python/stem/', '1.6.0', 'stem-([0-9\.]+).tar.gz'), + Package('freebsd', 'https://www.freshports.org/security/py-stem/', '1.6.0', FREEBSD_VERSION), + Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/py-stem/Makefile?rev=HE…', '1.6.0', OPENBSD_EGG_VERSION), + ]), + ('txtorcon', [ + Package('debian', 'https://packages.debian.org/sid/python-txtorcon', '0.19.3', DEBIAN_VERSION), + #Package('gentoo', 'https://packages.gentoo.org/packages/dev-python/txtorcon', '0.19.3', None), + Package('slackware', 'https://slackbuilds.org/repository/14.2/python/txtorcon/', '0.19.3', 'txtorcon-([0-9\.]+).tar.gz'), + Package('freebsd', 'https://www.freshports.org/security/py-txtorcon/', '0.19.3', FREEBSD_VERSION), + ]), + ('torsocks', [ + Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/tor…', '2.2.0', ':tag => "v([0-9\.]+)",'), + Package('debian', 'https://packages.debian.org/sid/torsocks', '2.2.0', DEBIAN_VERSION), + Package('fedora', 'https://apps.fedoraproject.org/packages/torsocks', '2.1.0', FEDORA_VERSION), + #Package('gentoo', 'https://packages.gentoo.org/packages/net-proxy/torsocks', '2.2.0', None), + Package('archlinux', 'https://www.archlinux.org/packages/community/x86_64/torsocks/', '2.2.0', ARCH_LINUX_VERSION), + Package('slackware', 'https://slackbuilds.org/repository/14.2/network/torsocks/', '2.2.0', 'torsocks $([0-9\.]+)$ </h2>'), + Package('freebsd', 'https://www.freshports.org/net/torsocks/', '2.2.0', 'SHA256 $dgoulet-torsocks-v([0-9\.]+)_GH0.tar.gz$'), + Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/torsocks/Makefile?rev=H…', '1.2', OPENBSD_DIST_VERSION), + ]), + ('ooni probe', [ + Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/oon…', '2.2.0', 'ooniprobe-([0-9\.]+).tar.gz'), + Package('debian', 'https://packages.debian.org/sid/ooniprobe', '2.2.0', DEBIAN_VERSION), + Package('archlinux', 'https://aur.archlinux.org/packages/ooniprobe/', '1.2.2', AUR_VERSION), + ]), +] + + +if __name__ == '__main__': + print(DIV) + print(COLUMN % ('Project', 'Platform', 'Version', 'Status')) + + for project, packages in PACKAGES: + print(DIV) + + for package in packages: + for i in range(3): + try: + request = urllib2.urlopen(package.url, timeout = 5).read() + break + except (urllib2.HTTPError, ssl.SSLError): + pass + + match = re.search(package.regex, request) + current_version = match.group(1) if match else None + + if not current_version: + msg = 'unable to determine current version' + elif current_version == package.version: + msg = 'up to date' + else: + msg = 'current version is %s but wiki has %s' % (current_version, package.version) + + print(COLUMN % (project, package.platform, package.version, msg)) + + print(DIV)

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 16 Dec '17

16 Dec '17

commit 462cf810163b345abc6ded024c2a61ff5964c798 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 16 12:50:47 2017 +0000 Update translations for tor-browser-manual_completed --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index b1d9b74eb..cc48e26f8 100644 --- a/de/de.po +++ b/de/de.po @@ -201,8 +201,8 @@ msgid "" "Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " "or" msgstr "" -"Schreibe eine E-Mail an bridges(a)torproject.org von einer Gmail-, Yahoo- " -"oder Riseup-E-Mail-Adresse oder" +"Schreiben Sie eine E-Mail an bridges(a)torproject.org von einer Gmail-, Yahoo-" +" oder Riseup-E-Mail-Adresse oder" #: bridges.page:51 msgid "Entering bridge addresses" @@ -375,9 +375,9 @@ msgid "" "xref=\"bridges\">Bridges</link> section to learn what bridges are and how to" " obtain them." msgstr "" -"Wenn Sie all diese Optioinen versuchen und Sie keine davon ins Internet " -"bringt müssen Sie Brücken-Adressen manuell eingeben. Lesen Sie den Abschnitt" -" <link xref=\"bridges\">Brücken</link> um zu erfahren was Brücken sind und " +"Wenn Sie alle diese Optionen ausprobieren und keine davon Sie online bringt," +" müssen Sie die Brücken-Adressen manuell eingeben. Lesen Sie den Abschnitt " +"<link xref=\"bridges\">Brücken</link>, um zu erfahren, was Brücken sind und " "wie Sie sie erhalten können." #: downloading.page:7

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 16 Dec '17

16 Dec '17

commit f0d816885bb24c7ebd2a5e6010635cc8b73afc4f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 16 12:50:41 2017 +0000 Update translations for tor-browser-manual --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index b1d9b74eb..cc48e26f8 100644 --- a/de/de.po +++ b/de/de.po @@ -201,8 +201,8 @@ msgid "" "Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " "or" msgstr "" -"Schreibe eine E-Mail an bridges(a)torproject.org von einer Gmail-, Yahoo- " -"oder Riseup-E-Mail-Adresse oder" +"Schreiben Sie eine E-Mail an bridges(a)torproject.org von einer Gmail-, Yahoo-" +" oder Riseup-E-Mail-Adresse oder" #: bridges.page:51 msgid "Entering bridge addresses" @@ -375,9 +375,9 @@ msgid "" "xref=\"bridges\">Bridges</link> section to learn what bridges are and how to" " obtain them." msgstr "" -"Wenn Sie all diese Optioinen versuchen und Sie keine davon ins Internet " -"bringt müssen Sie Brücken-Adressen manuell eingeben. Lesen Sie den Abschnitt" -" <link xref=\"bridges\">Brücken</link> um zu erfahren was Brücken sind und " +"Wenn Sie alle diese Optionen ausprobieren und keine davon Sie online bringt," +" müssen Sie die Brücken-Adressen manuell eingeben. Lesen Sie den Abschnitt " +"<link xref=\"bridges\">Brücken</link>, um zu erfahren, was Brücken sind und " "wie Sie sie erhalten können." #: downloading.page:7

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 16 Dec '17

16 Dec '17

commit 16780f02f1da789ec2eefd6ae7200ad1dbb06f5f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 16 12:50:35 2017 +0000 Update translations for exoneratorproperties_completed --- de/exonerator.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/de/exonerator.properties b/de/exonerator.properties index 29b5e8814..652826801 100644 --- a/de/exonerator.properties +++ b/de/exonerator.properties @@ -19,6 +19,8 @@ summary.invalidparams.invalidip.title=Ungültige IP-Adresse summary.invalidparams.invalidip.body=%s ist keine gültige IP-Adresse. Zulässige IP-Adress-Formate sind %s oder %s. summary.invalidparams.invalidtimestamp.title=Ungültiges Datum summary.invalidparams.invalidtimestamp.body=%s ist kein gültiges Datum. Das zulässige Datumsformat ist %s. +summary.invalidparams.timestamptoorecent.title=Datumsparameter zu neu +summary.invalidparams.timestamptoorecent.body=Möglicherweise enthält die Datenbank noch nicht genügend Daten, um diese Anfrage korrekt zu beantworten. Das letzte gültige Datum ist vorgestern. Bitte wiederholen Sie Ihre Suche an einem anderen Tag. summary.serverproblem.nodata.title=Server-Problem summary.serverproblem.nodata.body.text=Die Datenbank enthält keine Daten für das angegebene Datum. Bitte versuchen Sie es später noch einmal. Sollte dieses Problem weiterhin bestehen %s. summary.serverproblem.nodata.body.link=lassen Sie es uns bitte wissen

1 0