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

[metrics-web/master] Fix table links.
by karsten＠torproject.org 25 Sep '13

25 Sep '13

commit abe62f65c2425175472b32051d7d7a54137319cb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 25 09:42:41 2013 +0200 Fix table links. --- web/WEB-INF/users.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index df509a8..06d7f4a 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -307,7 +307,7 @@ reduces time to graph from about 3 days to about 1 day.</li> </tr> <c:forEach var="row" items="${userstats_relay_tabledata}"> <tr> - <td><a href="users.html?graph=userstats-relay-country&country=${row['cc']}#userstats-relay">${row['country']}</a>&emsp;</td> + <td><a href="users.html?graph=userstats-relay-country&country=${row['cc']}#userstats-relay-country">${row['country']}</a>&emsp;</td> <td>${row['abs']} (<fmt:formatNumber type="number" minFractionDigits="2" value="${row['rel']}" /> %)</td> </tr> </c:forEach> @@ -340,7 +340,7 @@ reduces time to graph from about 3 days to about 1 day.</li> </tr> <c:forEach var="row" items="${userstats_censorship_events_tabledata}"> <tr> - <td><a href="users.html?graph=direct-users&country=${row['cc']}&events=on#direct-users">${row['country']}</a>&emsp;</td> + <td><a href="users.html?graph=userstats-relay-country&country=${row['cc']}&events=on#userstats-relay-country">${row['country']}</a>&emsp;</td> <td>${row['downturns']}</td> <td>${row['upturns']}</td> </tr> @@ -410,7 +410,7 @@ It's yet to be decided which approach is more correct.</font> </tr> <c:forEach var="row" items="${userstats_bridge_tabledata}"> <tr> - <td><a href="users.html?graph=userstats-bridge-country&country=${row['cc']}#userstats-bridge">${row['country']}</a>&emsp;</td> + <td><a href="users.html?graph=userstats-bridge-country&country=${row['cc']}#userstats-bridge-country">${row['country']}</a>&emsp;</td> <td>${row['abs']} (<fmt:formatNumber type="number" minFractionDigits="2" value="${row['rel']}" /> %)</td> </tr> </c:forEach>

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 25 Sep '13

25 Sep '13

commit 6a86d533a10f1bcd3580f25d9529a845efefafbf Merge: 919aae1 e33b779 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 24 20:49:00 2013 -0700 Merge branch 'maint-2.4' build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[torbrowser/master] Add 3.0alpha4 to recommended versions for transition.
by mikeperry＠torproject.org 25 Sep '13

25 Sep '13

commit e33b779619df408150b08f41ce1935eae67656c2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 24 20:47:00 2013 -0700 Add 3.0alpha4 to recommended versions for transition. --- build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index c54b535..ea37d0f 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -19,5 +19,8 @@ "2.4.17-beta-2-Linux", "3.0-alpha-3-Linux", "3.0-alpha-3-MacOS", -"3.0-alpha-3-Windows" +"3.0-alpha-3-Windows", +"3.0-alpha-4-Linux", +"3.0-alpha-4-MacOS", +"3.0-alpha-4-Windows" ]

1 0

[torbrowser/maint-2.4] Add 3.0alpha4 to recommended versions for transition.
by mikeperry＠torproject.org 25 Sep '13

25 Sep '13

commit e33b779619df408150b08f41ce1935eae67656c2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 24 20:47:00 2013 -0700 Add 3.0alpha4 to recommended versions for transition. --- build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index c54b535..ea37d0f 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -19,5 +19,8 @@ "2.4.17-beta-2-Linux", "3.0-alpha-3-Linux", "3.0-alpha-3-MacOS", -"3.0-alpha-3-Windows" +"3.0-alpha-3-Windows", +"3.0-alpha-4-Linux", +"3.0-alpha-4-MacOS", +"3.0-alpha-4-Windows" ]

1 0

[doctor/master] Including certificate expiration date in notice
by atagar＠torproject.org 25 Sep '13

25 Sep '13

commit edb251251dda0b6aae9e4b2c5604569e6646da2f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 24 20:35:10 2013 -0700 Including certificate expiration date in notice Suggestion by Karsten. Didn't catch that the java version did this - it's certainly a good thing to include. --- consensus_health_checker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 6c78880..45e6f64 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -317,16 +317,17 @@ def certificate_expiration(latest_consensus, consensuses, votes): # votes should only have a single authority entry (the one that issued this vote) cert_expiration = vote.directory_authorities[0].key_certificate.expires + expiration_label = '%s (%s)' % (authority, cert_expiration.strftime('%Y-%m-%d %H-%M-%S')) if (cert_expiration - current_time) <= datetime.timedelta(days = 14): if rate_limit_notice('cert_expiration.two_weeks.%s' % authority, days = 14): - issues.append(Issue.for_msg(Runlevel.WARNING, 'CERTIFICATE_ABOUT_TO_EXPIRE', 'two weeks', authority)) + issues.append(Issue.for_msg(Runlevel.WARNING, 'CERTIFICATE_ABOUT_TO_EXPIRE', 'two weeks', expiration_label)) elif (cert_expiration - current_time) <= datetime.timedelta(days = 60): if rate_limit_notice('cert_expiration.two_months.%s' % authority, days = 60): - issues.append(Issue.for_msg(Runlevel.NOTICE, 'CERTIFICATE_ABOUT_TO_EXPIRE', 'two months', authority)) + issues.append(Issue.for_msg(Runlevel.NOTICE, 'CERTIFICATE_ABOUT_TO_EXPIRE', 'two months', expiration_label)) elif (cert_expiration - current_time) <= datetime.timedelta(days = 90): if rate_limit_notice('cert_expiration.three_months.%s' % authority, days = 90): - issues.append(Issue.for_msg(Runlevel.NOTICE, 'CERTIFICATE_ABOUT_TO_EXPIRE', 'three months', authority)) + issues.append(Issue.for_msg(Runlevel.NOTICE, 'CERTIFICATE_ABOUT_TO_EXPIRE', 'three months', expiration_label)) return issues

1 0

[tor/master] Always call circuit_n_chan_done(chan, 0) from channel_closed()
by nickm＠torproject.org 24 Sep '13

24 Sep '13

commit 938ee9b24dfda03a68a71d43b88e9fb00a90f9c8 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Sep 23 09:37:26 2013 -0700 Always call circuit_n_chan_done(chan, 0) from channel_closed() --- changes/bug9776 | 5 +++++ src/or/channel.c | 9 ++++----- src/or/connection_or.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/changes/bug9776 b/changes/bug9776 new file mode 100644 index 0000000..ea3a96a --- /dev/null +++ b/changes/bug9776 @@ -0,0 +1,5 @@ + o Normal bugfixes: + - Always call circuit_n_chan_done(chan, 0) from channel_closed(), so we + can't leak pending circuits in some cases where + run_connection_housekeeping() calls connection_or_close_normally(). + Fixes bug #9776; bugfix on 0.2.4.17. diff --git a/src/or/channel.c b/src/or/channel.c index 602797d..1fb39b8 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1292,11 +1292,10 @@ channel_closed(channel_t *chan) if (chan->state == CHANNEL_STATE_CLOSED || chan->state == CHANNEL_STATE_ERROR) return; - if (chan->reason_for_closing == CHANNEL_CLOSE_FOR_ERROR) { - /* Inform any pending (not attached) circs that they should - * give up. */ - circuit_n_chan_done(chan, 0); - } + /* Inform any pending (not attached) circs that they should + * give up. */ + circuit_n_chan_done(chan, 0); + /* Now close all the attached circuits on it. */ circuit_unlink_all_from_channel(chan, END_CIRC_REASON_CHANNEL_CLOSED); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 0e9d06a..3d16e14 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1160,6 +1160,16 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, /** Mark orconn for close and transition the associated channel, if any, to * the closing state. + * + * It's safe to call this and connection_or_close_for_error() any time, and + * channel layer will treat it as a connection closing for reasons outside + * its control, like the remote end closing it. It can also be a local + * reason that's specific to connection_t/or_connection_t rather than + * the channel mechanism, such as expiration of old connections in + * run_connection_housekeeping(). If you want to close a channel_t + * from somewhere that logically works in terms of generic channels + * rather than connections, use channel_mark_for_close(); see also + * the comment on that function in channel.c. */ void

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 24 Sep '13

24 Sep '13

commit 759de9f756cac3fb4034bfbbb7fd5195c0b24a34 Merge: 31f6806 938ee9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 24 10:47:26 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9776 | 5 +++++ src/or/channel.c | 9 ++++----- src/or/connection_or.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.4] Always call circuit_n_chan_done(chan, 0) from channel_closed()
by nickm＠torproject.org 24 Sep '13

24 Sep '13

commit 938ee9b24dfda03a68a71d43b88e9fb00a90f9c8 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Sep 23 09:37:26 2013 -0700 Always call circuit_n_chan_done(chan, 0) from channel_closed() --- changes/bug9776 | 5 +++++ src/or/channel.c | 9 ++++----- src/or/connection_or.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/changes/bug9776 b/changes/bug9776 new file mode 100644 index 0000000..ea3a96a --- /dev/null +++ b/changes/bug9776 @@ -0,0 +1,5 @@ + o Normal bugfixes: + - Always call circuit_n_chan_done(chan, 0) from channel_closed(), so we + can't leak pending circuits in some cases where + run_connection_housekeeping() calls connection_or_close_normally(). + Fixes bug #9776; bugfix on 0.2.4.17. diff --git a/src/or/channel.c b/src/or/channel.c index 602797d..1fb39b8 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1292,11 +1292,10 @@ channel_closed(channel_t *chan) if (chan->state == CHANNEL_STATE_CLOSED || chan->state == CHANNEL_STATE_ERROR) return; - if (chan->reason_for_closing == CHANNEL_CLOSE_FOR_ERROR) { - /* Inform any pending (not attached) circs that they should - * give up. */ - circuit_n_chan_done(chan, 0); - } + /* Inform any pending (not attached) circs that they should + * give up. */ + circuit_n_chan_done(chan, 0); + /* Now close all the attached circuits on it. */ circuit_unlink_all_from_channel(chan, END_CIRC_REASON_CHANNEL_CLOSED); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 0e9d06a..3d16e14 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1160,6 +1160,16 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, /** Mark orconn for close and transition the associated channel, if any, to * the closing state. + * + * It's safe to call this and connection_or_close_for_error() any time, and + * channel layer will treat it as a connection closing for reasons outside + * its control, like the remote end closing it. It can also be a local + * reason that's specific to connection_t/or_connection_t rather than + * the channel mechanism, such as expiration of old connections in + * run_connection_housekeeping(). If you want to close a channel_t + * from somewhere that logically works in terms of generic channels + * rather than connections, use channel_mark_for_close(); see also + * the comment on that function in channel.c. */ void

1 0

[torbirdy/master] Adding brand new shiny TorBirdy logo
by sukhbir＠torproject.org 24 Sep '13

24 Sep '13

commit b94e032584122a4b89b2525ca49db6c661a5113f Author: mrphs <mrphs(a)Nimas-MacBook-Pro.local> Date: Mon Sep 23 17:42:04 2013 -0700 Adding brand new shiny TorBirdy logo --- chrome/skin/images/Logo-64.png | Bin 0 -> 40849 bytes install.rdf | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/skin/images/Logo-64.png b/chrome/skin/images/Logo-64.png new file mode 100644 index 0000000..fcfc9cb Binary files /dev/null and b/chrome/skin/images/Logo-64.png differ diff --git a/install.rdf b/install.rdf index 0a6f6fc..862bb84 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ <em:id>castironthunderbirdclub(a)torproject.org</em:id> <em:version>0.1.1</em:version> <em:type>2</em:type> - <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL> + <em:iconURL>chrome://castironthunderbirdclub/skin/images/Logo-64.png</em:iconURL> <em:targetApplication>

1 0

[torbirdy/master] Merge pull request #14 from mrphs/master
by sukhbir＠torproject.org 24 Sep '13

24 Sep '13

commit bf317f58cea05cbcfca2ffede382c332c809eba9 Merge: 2ecedff b94e032 Author: Sukhbir Singh <sukhbir.in(a)gmail.com> Date: Mon Sep 23 17:52:39 2013 -0700 Merge pull request #14 from mrphs/master Adding brand new shiny TorBirdy logo chrome/skin/images/Logo-64.png | Bin 0 -> 40849 bytes install.rdf | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)

1 0