May 2014 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 882893c8c3657be66b48580aa972e71dac25da5e Merge: 894c8b2 bd3db82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 23:04:48 2014 -0400 Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4 changes/bug11513 | 12 ++++ src/common/gen_server_ciphers.py | 115 ++++++++++++++++++++++++++++++++++++++ src/common/tortls.c | 40 +++++++++---- 3 files changed, 155 insertions(+), 12 deletions(-)

1 0

[tor/release-0.2.4] Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 411c622906c0b6b071874634781684c65485898a Merge: 0ad8133 bb9b4c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 23:11:32 2014 -0400 Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4 changes/bug11553 | 5 +++++ src/or/channel.h | 2 ++ src/or/circuitbuild.c | 9 ++++++++- 3 files changed, 15 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 0ad8133a7e4f70120986f02bddb3abb6cc3d9509 Merge: 882893c 0b319de Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 23:04:59 2014 -0400 Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4 changes/ticket11528 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 183c861e9a235fd9de565721329b38cde65bfbd4 Merge: 75e10f5 411c622 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 23:20:58 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4 changes/bug10849_023 | 6 ++ changes/bug11513 | 12 +++ changes/bug11553 | 5 ++ changes/bug7164_downgrade | 6 ++ changes/bug9686_024 | 5 ++ changes/ff28_ciphers | 6 ++ changes/md_leak_bug | 5 ++ changes/ticket11528 | 6 ++ src/common/ciphers.inc | 169 ++++++++++++------------------------- src/common/gen_server_ciphers.py | 115 +++++++++++++++++++++++++ src/common/get_mozilla_ciphers.py | 30 +++++-- src/common/tortls.c | 44 +++++++--- src/or/channel.h | 2 + src/or/circuitbuild.c | 9 +- src/or/config.c | 10 ++- src/or/microdesc.c | 2 +- src/or/routerparse.c | 2 + 17 files changed, 296 insertions(+), 138 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 08 May '14

08 May '14

commit defe541a3084532eb34bab82341752323cf7efca Merge: 2d83770 411c622 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 23:12:51 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4'

1 0

[tor/master] Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 411c622906c0b6b071874634781684c65485898a Merge: 0ad8133 bb9b4c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 23:11:32 2014 -0400 Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4 changes/bug11553 | 5 +++++ src/or/channel.h | 2 ++ src/or/circuitbuild.c | 9 ++++++++- 3 files changed, 15 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] Supply better and less frequent warnings on circID exhaustion
by nickm＠torproject.org 08 May '14

08 May '14

commit bb9b4c37f8e7f5cf78918f382e90d8b11ff42551 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 12:28:30 2014 -0400 Supply better and less frequent warnings on circID exhaustion Fixes the surface behavior of #11553 --- changes/bug11553 | 5 +++++ src/or/channel.h | 2 ++ src/or/circuitbuild.c | 9 ++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/changes/bug11553 b/changes/bug11553 new file mode 100644 index 0000000..1540f46 --- /dev/null +++ b/changes/bug11553 @@ -0,0 +1,5 @@ + o Minor features: + - When we run out of usable circuit IDs on a channel, log only one + warning for the whole channel, and include a description of + how many circuits there were on the channel. Fix for part of ticket + #11553. diff --git a/src/or/channel.h b/src/or/channel.h index 2dca817..29ba40e 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -148,6 +148,8 @@ struct channel_s { ENUM_BF(circ_id_type_t) circ_id_type:2; /** DOCDOC*/ unsigned wide_circ_ids:1; + /** Have we logged a warning about circID exhaustion on this channel? */ + unsigned warned_circ_ids_exhausted:1; /* * Which circ_id do we try to use next on this connection? This is * always in the range 0..1<<15-1. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e47a278..2b4d3c3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -127,7 +127,14 @@ get_unique_circ_id_by_chan(channel_t *chan) /* Make sure we don't loop forever if all circ_id's are used. This * matters because it's an external DoS opportunity. */ - log_warn(LD_CIRC,"No unused circ IDs. Failing."); + if (! chan->warned_circ_ids_exhausted) { + chan->warned_circ_ids_exhausted = 1; + log_warn(LD_CIRC,"No unused circIDs found on channel %s wide " + "circID support, with %u inbound and %u outbound circuits. " + "Failing a circuit.", + chan->wide_circ_ids ? "with" : "without", + chan->num_p_circuits, chan->num_n_circuits); + } return 0; } test_circ_id |= high_bit;

1 0

[tor/maint-0.2.4] Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 411c622906c0b6b071874634781684c65485898a Merge: 0ad8133 bb9b4c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 23:11:32 2014 -0400 Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4 changes/bug11553 | 5 +++++ src/or/channel.h | 2 ++ src/or/circuitbuild.c | 9 ++++++++- 3 files changed, 15 insertions(+), 1 deletion(-)

1 0

r26771: {website} Cleaned up duplicate paragraph on tbb project page. (website/trunk/projects/en)
by Matt Pagan 08 May '14

08 May '14

Author: mttp Date: 2014-05-08 03:11:21 +0000 (Thu, 08 May 2014) New Revision: 26771 Modified: website/trunk/projects/en/torbrowser.wml Log: Cleaned up duplicate paragraph on tbb project page. Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-05-08 03:00:58 UTC (rev 26770) +++ website/trunk/projects/en/torbrowser.wml 2014-05-08 03:11:21 UTC (rev 26771) @@ -257,7 +257,7 @@ <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ru.tar.xz.asc">sig</a>)</em></td> </tr> <tr class="alt"> - <td>Türkçe; (tr)</td> + <td>Türkçe (tr)</td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_tr.exe">32-bit</a> <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_tr.exe.asc">sig</a>)</em></td> <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_tr.dmg">32-bit</a> @@ -307,14 +307,6 @@ </div> </div> - <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>, - which allows you to make sure you've downloaded the file we intended - you to get. Also, note that the Firefox ESR in our bundles is - <a href="https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/confi…">modified</a> from the <a - href="https://www.mozilla.org/en-US/firefox/organizations/">default - Firefox ESR</a></p> - </div> - </div> <div id="macosx" class="anchor"></div> <div class="macosx box"> <div class="pjtitle"><h2>Mac OSX Instructions</h2></div>

1 0

[tor/master] Merge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 894c8b22662131817e5d7383740b2b285f9b7491 Merge: 14bc6e8 4231729 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 23:04:22 2014 -0400 Merge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4 changes/ff28_ciphers | 6 ++ src/common/ciphers.inc | 169 ++++++++++++------------------------- src/common/get_mozilla_ciphers.py | 30 +++++-- 3 files changed, 84 insertions(+), 121 deletions(-)

1 0