June 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Merge branch 'bug9017' into maint-0.2.3
by nickm＠torproject.org 10 Jun '13

10 Jun '13

commit 4835faebf533f93eb390649dfcb5c8cc0289e3d3 Merge: fe689de 77a1935 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 12:25:14 2013 -0400 Merge branch 'bug9017' into maint-0.2.3 changes/bug9017 | 6 ++++++ src/or/connection_edge.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 10 Jun '13

10 Jun '13

commit 607b29ae1abe7da7d06e4e9282ed88a2dd7fe8d4 Merge: c860a96 4835fae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 12:26:39 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug9017 | 6 ++++++ src/or/connection_edge.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.4] Fix (Open?)BSD fast-connect bug with optimistic data.
by nickm＠torproject.org 10 Jun '13

10 Jun '13

commit 77a193533966c5c2f81e6a85b3c2a7446076508f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 12:14:49 2013 -0400 Fix (Open?)BSD fast-connect bug with optimistic data. There's an assertion failure that can occur if a connection has optimistic data waiting, and then the connect() call returns 0 on the first attempt (rather than -1 and EINPROGRESS). That latter behavior from connect() appears to be an (Open?)BSDism when dealing with remote addresses in some cases. (At least, I've only seen it reported with the BSDs under libevent, even when the address was 127.0.0.1. And we've only seen this problem in Tor with OpenBSD.) Fixes bug 9017; bugfix on 0.2.3.1-alpha, which first introduced optimistic data. (Although you could also argue that the commented-out connection_start_writing in 155c9b80 back in 2002 is the real source of the issue.) --- changes/bug9017 | 6 ++++++ src/or/connection_edge.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug9017 b/changes/bug9017 new file mode 100644 index 0000000..359c526 --- /dev/null +++ b/changes/bug9017 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Avoid an assertion failure on OpenBSD (and perhaps other BSDs) + when an exit connection with optimistic data succeeds immediately + rather than returning EINPROGRESS. Fixes bug 9017; bugfix on + 0.2.3.1-alpha. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 9563ca6..362ad9a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3302,12 +3302,13 @@ connection_exit_connect(edge_connection_t *edge_conn) conn->state = EXIT_CONN_STATE_OPEN; if (connection_get_outbuf_len(conn)) { - /* in case there are any queued data cells */ - log_warn(LD_BUG,"newly connected conn had data waiting!"); -// connection_start_writing(conn); + /* in case there are any queued data cells, from e.g. optimistic data */ + IF_HAS_NO_BUFFEREVENT(conn) + connection_watch_events(conn, READ_EVENT|WRITE_EVENT); + } else { + IF_HAS_NO_BUFFEREVENT(conn) + connection_watch_events(conn, READ_EVENT); } - IF_HAS_NO_BUFFEREVENT(conn) - connection_watch_events(conn, READ_EVENT); /* also, deliver a 'connected' cell back through the circuit. */ if (connection_edge_is_rendezvous_stream(edge_conn)) {

1 0

[tor/maint-0.2.3] Merge branch 'bug9017' into maint-0.2.3
by nickm＠torproject.org 10 Jun '13

10 Jun '13

commit 4835faebf533f93eb390649dfcb5c8cc0289e3d3 Merge: fe689de 77a1935 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 12:25:14 2013 -0400 Merge branch 'bug9017' into maint-0.2.3 changes/bug9017 | 6 ++++++ src/or/connection_edge.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.3] Fix (Open?)BSD fast-connect bug with optimistic data.
by nickm＠torproject.org 10 Jun '13

10 Jun '13

commit 77a193533966c5c2f81e6a85b3c2a7446076508f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 12:14:49 2013 -0400 Fix (Open?)BSD fast-connect bug with optimistic data. There's an assertion failure that can occur if a connection has optimistic data waiting, and then the connect() call returns 0 on the first attempt (rather than -1 and EINPROGRESS). That latter behavior from connect() appears to be an (Open?)BSDism when dealing with remote addresses in some cases. (At least, I've only seen it reported with the BSDs under libevent, even when the address was 127.0.0.1. And we've only seen this problem in Tor with OpenBSD.) Fixes bug 9017; bugfix on 0.2.3.1-alpha, which first introduced optimistic data. (Although you could also argue that the commented-out connection_start_writing in 155c9b80 back in 2002 is the real source of the issue.) --- changes/bug9017 | 6 ++++++ src/or/connection_edge.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug9017 b/changes/bug9017 new file mode 100644 index 0000000..359c526 --- /dev/null +++ b/changes/bug9017 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Avoid an assertion failure on OpenBSD (and perhaps other BSDs) + when an exit connection with optimistic data succeeds immediately + rather than returning EINPROGRESS. Fixes bug 9017; bugfix on + 0.2.3.1-alpha. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 9563ca6..362ad9a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3302,12 +3302,13 @@ connection_exit_connect(edge_connection_t *edge_conn) conn->state = EXIT_CONN_STATE_OPEN; if (connection_get_outbuf_len(conn)) { - /* in case there are any queued data cells */ - log_warn(LD_BUG,"newly connected conn had data waiting!"); -// connection_start_writing(conn); + /* in case there are any queued data cells, from e.g. optimistic data */ + IF_HAS_NO_BUFFEREVENT(conn) + connection_watch_events(conn, READ_EVENT|WRITE_EVENT); + } else { + IF_HAS_NO_BUFFEREVENT(conn) + connection_watch_events(conn, READ_EVENT); } - IF_HAS_NO_BUFFEREVENT(conn) - connection_watch_events(conn, READ_EVENT); /* also, deliver a 'connected' cell back through the circuit. */ if (connection_edge_is_rendezvous_stream(edge_conn)) {

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 10 Jun '13

10 Jun '13

commit 1db6772d4e6424062dfc9e5e93caa8141e48aa67 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 10 15:16:27 2013 +0000 Update translations for tor-launcher-properties --- fa/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties index e5ef76d..79b1565 100644 --- a/fa/torlauncher.properties +++ b/fa/torlauncher.properties @@ -10,7 +10,7 @@ # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S # torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. +torlauncher.torrc_missing=فایل torrc پیدا نشده‌است. # torlauncher.datadir_missing=The Tor data directory does not exist. # torlauncher.password_hash_missing=Failed to get hashed password.

1 0

r26211: {website} link to the nsa prism and tor blog post. (website/trunk/en)
by Andrew Lewman 10 Jun '13

10 Jun '13

Author: phobos Date: 2013-06-10 14:39:54 +0000 (Mon, 10 Jun 2013) New Revision: 26211 Modified: website/trunk/en/index.wml Log: link to the nsa prism and tor blog post. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2013-06-10 03:32:19 UTC (rev 26210) +++ website/trunk/en/index.wml 2013-06-10 14:39:54 UTC (rev 26211) @@ -192,6 +192,12 @@ <table> <tr> <td> + <div class="calendar"><span class="month">Jun</span><br><span class="day">8</span></div> + <p>Read our <a href="https://blog.torproject.org/blog/prism-vs-tor">thoughts on the NSA PRISM</a> revelation and how it relates to Tor.</p> + </td> + </tr> + <tr> + <td> <div class="calendar"><span class="month">Feb</span><br><span class="day">5</span></div> <p>Read Roger's <a href="https://blog.torproject.org/blog/trip-report-tor-trainings-dutch-and-belgia…">trip report about teaching the Dutch and Belgian police about Tor</a>.</p>

1 0

[metrics-tasks/master] Add bubble-cw-by-as (#6443)
by karsten＠torproject.org 10 Jun '13

10 Jun '13

commit d881561370c7fe5d10368e756e292633985bfbc7 Author: Lunar <lunar(a)torproject.org> Date: Fri Jun 7 17:50:40 2013 +0200 Add bubble-cw-by-as (#6443) Visualize the Tor network grouped by AS. With mouseovers. --- task-6443/bubble-cw/bubble-cw-by-as.html | 142 ++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/task-6443/bubble-cw/bubble-cw-by-as.html b/task-6443/bubble-cw/bubble-cw-by-as.html new file mode 100644 index 0000000..8133aa1 --- /dev/null +++ b/task-6443/bubble-cw/bubble-cw-by-as.html @@ -0,0 +1,142 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<style> + +text { + font: 10px sans-serif; +} + +</style> +<body> +<script src="d3.min.js"></script> + +<script> +var diameter = 1200, + format = d3.format(",d"), + color = d3.scale.category20c(); + +var bubble = d3.layout.pack() + .sort(null) + .size([diameter, diameter]) + .padding(1.5); + +var svg = d3.select("body").append("svg") + .attr("width", diameter) + .attr("height", diameter) + .attr("class", "bubble"); + +d3.json("details.json", function(error, data) { + var by_as = {}; + data.relays.forEach(function(relay) { + if (relay.running) { + if (!by_as.hasOwnProperty(relay.as_number)) { + by_as[relay.as_number] = { name: relay.as_name, children: [] }; + } + by_as[relay.as_number].children.push({ name: relay.nickname ? relay.fingerprint : relay.nickname, + value: relay.consensus_weight }); + } + }); + + var cutOff = 100 / 8 * 1000; // 100 Mbit/s + var bubbles = svg.selectAll(".node") + .data(bubble.nodes({ children: d3.values(by_as) })); + var node = bubbles.enter().append("g") + .attr("class", "node") + .attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; }); + + node.append("circle") + .filter(function(d) { return d.children && d.name; }) + .attr("r", function(d) { return d.r; }) + .style("fill", "#888888") + .style("fill-opacity", ".25"); + + node.filter(function(d) { return !d.children;}) + .append("image") + .attr("xlink:href", function(d) { return "tor-consensus-vis-node-" + (d.value > cutOff ? "onion" : "circle") + ".svg"; }) + .attr("transform", function(d) { return "translate(" + -d.r + "," + -d.r + ")"; }) + .attr("width", function(d) { return d.r * 2; }) + .attr("height", function(d) { return d.r * 2; }) + .attr("preserveAspectRatio", "xMidYMin"); + + node.filter(function(d) { return d.children && d.name; }) + .each(function(d) { + var g = svg.append("g") + .attr("transform", "translate(" + d.x + "," + d.y + ")"); + g.append("circle") + .attr("r", d.r) + .style("fill", "#000000") + .style("fill-opacity", "0") + .style("stroke", "none"); + g.on("mouseover", function() { + svg.append("text") + .attr("transform", "translate(" + d.x + "," + (d.y - d.r) + ")") + .attr("id", "group-name") + .style("text-anchor", "middle") + .style("font-size", "14pt") + .text((d.name + "").substring(0, 20)); + }) + .on("mouseout", function() { + d3.select("#group-name").remove(); + }); + }); + + /* + node.filter(function(d) { return !d.children && d.value > cutOff; }) + .append("text") + .attr("dy", ".3em") + .style("text-anchor", "middle") + .text(function(d) { return d.className; }); + */ + + var title = svg.append("g") + .attr("transform", "translate(" + (diameter / 3) +", " + (diameter - 30) + ")"); + title.append("text") + .text("by as") + .attr("text-anchor", "middle") + .attr("style", "font-size: 18pt"); + title.append("text") + .text(data['relays_published']) + .attr("text-anchor", "middle") + .attr("dy", "15") + .attr("style", "font-size: 10pt"); + + var legendWidth = 270; + var legendHeight = 115; + var legendIconSize = 50; + var legendIconMargin = (legendHeight - legendIconSize * 2) / 3; + var legend = svg.append("g") + .attr("transform", "translate(" + (diameter - legendWidth - 10) +", " + (diameter - legendHeight - 10) + ")") + legend.append("rect") + .attr("width", legendWidth) + .attr("height", legendHeight) + .attr("fill", "#cccccc") + .attr("stroke", "#000000"); + var legendOnion = legend.append("g") + .attr("transform", "translate(0, " + legendIconMargin + ")"); + legendOnion.append("image") + .attr("xlink:href", "tor-consensus-vis-node-onion.svg") + .attr("width", legendIconSize) + .attr("height", legendIconSize) + .attr("preserveAspectRatio", "xMidYMin"); + legendOnion.append("text") + .text("relays with at least " + (cutOff * 8 / 1000) + " Mbit/s of capacity") + .attr("text-anchor", "start") + .attr("dx", legendIconSize) + .attr("dy", legendIconSize / 2) + var legendCircle = legend.append("g") + .attr("transform", "translate(0, " + (legendIconSize + legendIconMargin * 2) + ")"); + legendCircle.append("image") + .attr("xlink:href", "tor-consensus-vis-node-circle.svg") + .attr("width", legendIconSize) + .attr("height", legendIconSize) + .attr("preserveAspectRatio", "xMidYMin"); + legendCircle.append("text") + .text("smaller relays") + .attr("text-anchor", "start") + .attr("dx", legendIconSize) + .attr("dy", legendIconSize / 2) +}); + +d3.select(self.frameElement).style("height", diameter + "px"); + +</script>

1 0

r26210: {website} relays are bigger these days (website/trunk/docs/en)
by Roger Dingledine 10 Jun '13

10 Jun '13

Author: arma Date: 2013-06-10 03:32:19 +0000 (Mon, 10 Jun 2013) New Revision: 26210 Modified: website/trunk/docs/en/tor-doc-osx.wml website/trunk/docs/en/tor-doc-unix.wml website/trunk/docs/en/tor-doc-windows.wml Log: relays are bigger these days Modified: website/trunk/docs/en/tor-doc-osx.wml =================================================================== --- website/trunk/docs/en/tor-doc-osx.wml 2013-06-09 15:49:47 UTC (rev 26209) +++ website/trunk/docs/en/tor-doc-osx.wml 2013-06-10 03:32:19 UTC (rev 26210) @@ -89,7 +89,7 @@ <p>The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 20 kilobytes/s each way, please help out Tor by configuring your + at least 50 kilobytes/s each way, please help out Tor by configuring your Tor to be a relay too. We have many features that make Tor relays easy and convenient, including rate limiting for bandwidth, exit policies so you can limit your exposure to abuse complaints, and support for dynamic Modified: website/trunk/docs/en/tor-doc-unix.wml =================================================================== --- website/trunk/docs/en/tor-doc-unix.wml 2013-06-09 15:49:47 UTC (rev 26209) +++ website/trunk/docs/en/tor-doc-unix.wml 2013-06-10 03:32:19 UTC (rev 26210) @@ -93,7 +93,7 @@ <p>The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 20 KiloBytes/s each way, please help out Tor by configuring your + at least 50 KiloBytes/s each way, please help out Tor by configuring your Tor to be a relay too. We have many features that make Tor relays easy and convenient, including rate limiting for bandwidth, exit policies so you can limit your exposure to abuse complaints, and support for dynamic Modified: website/trunk/docs/en/tor-doc-windows.wml =================================================================== --- website/trunk/docs/en/tor-doc-windows.wml 2013-06-09 15:49:47 UTC (rev 26209) +++ website/trunk/docs/en/tor-doc-windows.wml 2013-06-10 03:32:19 UTC (rev 26210) @@ -122,7 +122,7 @@ <p>The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 20 kilobytes/s each way, please help out Tor by configuring your + at least 50 kilobytes/s each way, please help out Tor by configuring your Tor to be a relay too. We have many features that make Tor relays easy and convenient, including rate limiting for bandwidth, exit policies so you can limit your exposure to abuse complaints, and support for dynamic

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 10 Jun '13

10 Jun '13

commit 8273a56e85bbe81772c86fc641e3e869047180ff Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 10 02:16:19 2013 +0000 Update translations for mat-gui --- fa.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fa.po b/fa.po index cd7252a..4a6004e 100644 --- a/fa.po +++ b/fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-06-07 22:00+0000\n" +"PO-Revision-Date: 2013-06-10 02:10+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -89,7 +89,7 @@ msgstr "" #: mat-gui:195 msgid "Process" -msgstr "" +msgstr "جریان" #: mat-gui:218 msgid "Help" @@ -97,7 +97,7 @@ msgstr "کمک" #: mat-gui:219 mat-gui:395 msgid "Supported formats" -msgstr "" +msgstr "قوالب قابل قبول" #: mat-gui:220 msgid "About" @@ -105,7 +105,7 @@ msgstr "درباره" #: mat-gui:241 msgid "Choose files" -msgstr "" +msgstr "فايل‌ها انتخاب کنید" #: mat-gui:248 msgid "All files" @@ -117,15 +117,15 @@ msgstr "" #: mat-gui:297 msgid "unknow" -msgstr "" +msgstr "ناشناخته" #: mat-gui:313 mat-gui:559 msgid "Dirty" -msgstr "" +msgstr "کثیف" #: mat-gui:343 msgid "Not-supported" -msgstr "" +msgstr "غیر قابل قبول" #: mat-gui:381 msgid "This software was coded during the GSoC 2011"

1 0