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

[tor/release-0.2.4] Try using INT_MAX, not SOMAXCONN, to set listen() backlog.
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit a2754d418dffb6188717d5e84d9bea59a2c9853b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 13:30:45 2013 -0400 Try using INT_MAX, not SOMAXCONN, to set listen() backlog. Fall back to SOMAXCONN if INT_MAX doesn't work. We'd like to do this because the actual maximum is overrideable by the kernel, and the value in the header file might not be right at all. All implementations I can find out about claim that this is supported. Fix for 9716; bugfix on every Tor. --- changes/bug9716 | 4 ++++ src/or/connection.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/changes/bug9716 b/changes/bug9716 new file mode 100644 index 0000000..5e39077 --- /dev/null +++ b/changes/bug9716 @@ -0,0 +1,4 @@ + o Bugfixes (performance): + - Set the listen() backlog limit to the largest actually supported + on the system, not to the value in a header file. Fixes bug 9716; + bugfix on every released Tor. diff --git a/src/or/connection.c b/src/or/connection.c index 6e754a0..41946e4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -926,6 +926,27 @@ make_socket_reuseable(tor_socket_t sock) #endif } +/** Max backlog to pass to listen. We start at */ +static int listen_limit = INT_MAX; + +/* Listen on <b>fd</b> with appropriate backlog. Return as for listen. */ +static int +tor_listen(tor_socket_t fd) +{ + int r; + + if ((r = listen(fd, listen_limit)) < 0) { + if (listen_limit == SOMAXCONN) + return r; + if ((r = listen(fd, SOMAXCONN)) == 0) { + listen_limit = SOMAXCONN; + log_warn(LD_NET, "Setting listen backlog to INT_MAX connections " + "didn't work, but SOMAXCONN did. Lowering backlog limit."); + } + } + return r; +} + /** Bind a new non-blocking socket listening to the socket described * by <b>listensockaddr</b>. * @@ -1009,7 +1030,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, } if (is_tcp) { - if (listen(s,SOMAXCONN) < 0) { + if (tor_listen(s) < 0) { log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort, tor_socket_strerror(tor_socket_errno(s))); tor_close_socket(s);

1 0

[tor/master] fix trivial typo
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit dd3f2f63324f1c8eeaf6027f345ce8cee6438f1a Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 10 16:05:35 2014 -0500 fix trivial typo --- src/or/directory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.h b/src/or/directory.h index 0453160..3de6932 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -30,7 +30,7 @@ typedef enum { DIRIND_ONEHOP=0, /** Connect over a multi-hop anonymizing Tor circuit */ DIRIND_ANONYMOUS=1, - /** Conncet to the DirPort directly */ + /** Connect to the DirPort directly */ DIRIND_DIRECT_CONN, /** Connect over a multi-hop anonymizing Tor circuit to our dirport */ DIRIND_ANON_DIRPORT,

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 10 Feb '14

10 Feb '14

commit f0100c6295ad56010141d9a62f6eba4036e29778 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 10 20:15:12 2014 +0000 Update translations for torcheck_completed --- de/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torcheck.po b/de/torcheck.po index e9fcbb2..bcb5d3f 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-02-10 19:42+0000\n" +"PO-Revision-Date: 2014-02-10 19:50+0000\n" "Last-Translator: Zweimaldhaelfti <sacha.bissig(a)windowslive.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 10 Feb '14

10 Feb '14

commit 018085c59ad0e8c439ee74e60395671afda682c3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 10 20:15:09 2014 +0000 Update translations for torcheck --- de/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torcheck.po b/de/torcheck.po index e9fcbb2..bcb5d3f 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-02-10 19:42+0000\n" +"PO-Revision-Date: 2014-02-10 19:50+0000\n" "Last-Translator: Zweimaldhaelfti <sacha.bissig(a)windowslive.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

r26602: {website} move the z-index to the right part of the css file (website/trunk/css)
by Roger Dingledine 10 Feb '14

10 Feb '14

Author: arma Date: 2014-02-10 20:06:23 +0000 (Mon, 10 Feb 2014) New Revision: 26602 Modified: website/trunk/css/layout.css Log: move the z-index to the right part of the css file Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2014-02-10 19:54:43 UTC (rev 26601) +++ website/trunk/css/layout.css 2014-02-10 20:06:23 UTC (rev 26602) @@ -980,7 +980,6 @@ padding: 1.4em 0.7em; width: 163px; margin: 0px 0px 0px 10px; - z-index:-10; } .dbox p { @@ -1000,6 +999,7 @@ height: 35px; margin-bottom: -20px; margin-left: -6px; + z-index:-10; } .dbox input.donate-btn {

1 0

[tor-browser-spec/master] Mention tor-qa.
by mikeperry＠torproject.org 10 Feb '14

10 Feb '14

commit 3f674b332e2b268e38eb8c393adb513e70bc2b5c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 10 12:02:39 2014 -0800 Mention tor-qa. --- processes/ReleaseProcess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index f9fe0b7..8a668da 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -28,6 +28,9 @@ make sign make match +#. Distribute build to tor-qa(a)lists.torproject.org + #XXX: Currently manual + #. Transfer builds to vescum torsocks rsync -aP $TORBROWSER_VERSION www-master.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbro…

1 0

[tor-browser-spec/master] Improve release process a bit.
by mikeperry＠torproject.org 10 Feb '14

10 Feb '14

commit 158b2e2c305cfb2e55849507f8b4d1d22671c438 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 10 11:10:49 2014 -0800 Improve release process a bit. Also we should think more about ordering these steps, but I think the website first is best for security releases, followed closely by the versions file, and then the blog post last? --- processes/ReleaseProcess | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 21f5866..f9fe0b7 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -29,17 +29,27 @@ make match #. Transfer builds to vescum - torsocks scp -r $TORBROWSER_VERSION www-master.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbro… + torsocks rsync -aP $TORBROWSER_VERSION www-master.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbro… #. Sign individual bundle files # XXX: This blocks on Erinn currently. We use her key for file sigs +#. Update website's torbrowser versions file + cd website + torsocks svn up . + vim ./include/versions.wmi + torsocks svn commit include/versions.wmi -m "Bump TBB version" + ./publish + cd .. + #. Update recommended-versions file in torbrowser.git cd torbrowser git checkout maint-2.4 + torsocks git pull origin vim ./build-scripts/recommended-versions git commit build-scripts/recommended-versions git checkout master + torsocks git pull origin git merge maint-2.4 torsocks git push origin maint-2.4:maint-2.4 torsocks git push origin master:master @@ -47,14 +57,6 @@ #. Create blog post from changelog # XXX: Template? -# See https://blog.torproject.org/blog/tor-browser-351-released for now +# See https://blog.torproject.org/blog/tor-browser-352-released for now # Don't forget to link to Mozilla's security advisories if this is a security # update, or Nadim will yell at you. - -#. Update website's torbrowser versions file - cd website - torsocks svn up . - vim ./include/versions.wmi - torsocks svn commit include/versions.wml -m "Bump TBB version" - ./publish - cd ..

1 0

[torbrowser/master] Bump TBB version for security release.
by mikeperry＠torproject.org 10 Feb '14

10 Feb '14

commit 76a279946381999d4333fae62e17a0221f04923b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 10 11:01:51 2014 -0800 Bump TBB version for security release. --- build-scripts/recommended-versions | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 49c3eb1..6fca0f2 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,5 @@ [ -"3.5-rc-1-Linux", -"3.5-rc-1-MacOS", -"3.5-rc-1-Windows", -"3.5-Linux", -"3.5-MacOS", -"3.5-Windows", -"3.5.1-Linux", -"3.5.1-MacOS", -"3.5.1-Windows" +"3.5.2-Linux", +"3.5.2-MacOS", +"3.5.2-Windows" ]

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 10 Feb '14

10 Feb '14

commit 9ea1d5d435cdbf1b256128c1e5064b73c740eea8 Merge: d1169bc 76a2799 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 10 11:02:16 2014 -0800 Merge branch 'maint-2.4' build-scripts/recommended-versions | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)

1 0

[torbrowser/maint-2.4] Bump TBB version for security release.
by mikeperry＠torproject.org 10 Feb '14

10 Feb '14

commit 76a279946381999d4333fae62e17a0221f04923b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 10 11:01:51 2014 -0800 Bump TBB version for security release. --- build-scripts/recommended-versions | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 49c3eb1..6fca0f2 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,5 @@ [ -"3.5-rc-1-Linux", -"3.5-rc-1-MacOS", -"3.5-rc-1-Windows", -"3.5-Linux", -"3.5-MacOS", -"3.5-Windows", -"3.5.1-Linux", -"3.5.1-MacOS", -"3.5.1-Windows" +"3.5.2-Linux", +"3.5.2-MacOS", +"3.5.2-Windows" ]

1 0