- tor-commits - lists.torproject.org

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 04 May '12

04 May '12

commit 6cabf03b3039040554bba11de5b96f733be8bcda Merge: b3787e1 f4a85c4 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 18:58:31 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2', remote-tracking branch 'shondoit/fix-unpack-source' into maint-2.2
by erinn＠torproject.org 04 May '12

04 May '12

commit f4a85c4c2afe8dff254e5e5cf625cdbb67ada1f3 Merge: dd611d8 9c42b14 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 18:58:15 2012 -0300 Merge branch 'maint-2.2', remote-tracking branch 'shondoit/fix-unpack-source' into maint-2.2 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix bug 5762: detect missing accept4 that gives ENOSYS
by nickm＠torproject.org 04 May '12

04 May '12

commit a1538d607d54065c2d74c8fa695d1c0b5e33c64f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 4 13:17:20 2012 -0400 Fix bug 5762: detect missing accept4 that gives ENOSYS We had been checking for EINVAL, but that means that SOCK_* isn't supported, not that the syscall itself is missing. Bugfix on 0.2.3.1-alpha, which started to use accept4. --- changes/bug5762 | 4 ++++ src/common/compat.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug5762 b/changes/bug5762 new file mode 100644 index 0000000..a91f4df --- /dev/null +++ b/changes/bug5762 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Work correctly on Linux systems with accept4 support advertised in + their headers, but without accept4 support in the kernel. Fix + by murb. Fixes bug 5762; bugfix on 0.2.3.1-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index fbb37ce..1a03f5e 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1013,10 +1013,11 @@ tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) s = accept4(sockfd, addr, len, SOCK_CLOEXEC); if (SOCKET_OK(s)) goto socket_ok; - /* If we got an error, see if it is EINVAL. EINVAL might indicate that, + /* If we got an error, see if it is ENOSYS. ENOSYS indicates that, * event though we were built on a system with accept4 support, we - * are running on one without. */ - if (errno != EINVAL) + * are running on one without. Also, check for EINVAL, which indicates that + * we are missing SOCK_CLOEXEC support. */ + if (errno != EINVAL && errno != ENOSYS) return s; #endif

1 0

r25639: {website} there isn't just one readme for tbb, there are six, link to (website/trunk/projects/en)
by Andrew Lewman 04 May '12

04 May '12

Author: phobos Date: 2012-05-04 17:18:35 +0000 (Fri, 04 May 2012) New Revision: 25639 Modified: website/trunk/projects/en/torbrowser-details.wml Log: there isn't just one readme for tbb, there are six, link to the tree instead and let people click on the readme that interests them. Modified: website/trunk/projects/en/torbrowser-details.wml =================================================================== --- website/trunk/projects/en/torbrowser-details.wml 2012-05-04 12:15:02 UTC (rev 25638) +++ website/trunk/projects/en/torbrowser-details.wml 2012-05-04 17:18:35 UTC (rev 25639) @@ -40,7 +40,7 @@ href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">source distribution</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">signature</a>). - See <a href="<tbbrepo>/README.dev">README</a> for + See <a href="https://gitweb.torproject.org/torbrowser.git/tree">README</a> for the directory layout and changelog. Build instructions can be found in <a href="<tbbrepo>/build-scripts/INSTALL">build-scripts/INSTALL</a>.</p> </div>

1 0

r25638: {website} remove the plain vidalia (alpha) bundle (website/trunk/download/en)
by Erinn Clark 04 May '12

04 May '12

Author: erinn Date: 2012-05-04 12:15:02 +0000 (Fri, 04 May 2012) New Revision: 25638 Modified: website/trunk/download/en/download.wml Log: remove the plain vidalia (alpha) bundle Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-05-04 10:41:19 UTC (rev 25637) +++ website/trunk/download/en/download.wml 2012-05-04 12:15:02 UTC (rev 25638) @@ -64,7 +64,6 @@ <div class="sig"> (<a href="<package-win32-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="additional" href="<package-win32-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-bundle-alpha>.asc">sig</a>) </div> <h2>Vidalia Bundle</h2>

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 04 May '12

04 May '12

commit b3787e1232593242d89d7e62357a73fb052fa20c Merge: dccbcc1 dd611d8 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:14:04 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[torbrowser/maint-2.2] update recommended-versions for 2.2.35-11
by erinn＠torproject.org 04 May '12

04 May '12

commit dd611d83e6285a7dc1bd3e1369e0fe0537e87f5c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:13:44 2012 -0300 update recommended-versions for 2.2.35-11 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 3859577..53554cf 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.35-10-MacOS-i386", -"2.2.35-10-MacOS-x86_64", -"2.2.35-9-Windows", -"2.2.35-10-Linux-i686", -"2.2.35-10-Linux-x86_64", +"2.2.35-11-MacOS-i386", +"2.2.35-11-MacOS-x86_64", +"2.2.35-11-Windows", +"2.2.35-11-Linux-i686", +"2.2.35-11-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

[torbrowser/maint-2.3] update recommended-versions for 2.2.35-11
by erinn＠torproject.org 04 May '12

04 May '12

commit dd611d83e6285a7dc1bd3e1369e0fe0537e87f5c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:13:44 2012 -0300 update recommended-versions for 2.2.35-11 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 3859577..53554cf 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.35-10-MacOS-i386", -"2.2.35-10-MacOS-x86_64", -"2.2.35-9-Windows", -"2.2.35-10-Linux-i686", -"2.2.35-10-Linux-x86_64", +"2.2.35-11-MacOS-i386", +"2.2.35-11-MacOS-x86_64", +"2.2.35-11-Windows", +"2.2.35-11-Linux-i686", +"2.2.35-11-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 04 May '12

04 May '12

commit b3787e1232593242d89d7e62357a73fb052fa20c Merge: dccbcc1 dd611d8 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:14:04 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[torbrowser/master] update recommended-versions for 2.2.35-11
by erinn＠torproject.org 04 May '12

04 May '12

commit dd611d83e6285a7dc1bd3e1369e0fe0537e87f5c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 4 08:13:44 2012 -0300 update recommended-versions for 2.2.35-11 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 3859577..53554cf 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.35-10-MacOS-i386", -"2.2.35-10-MacOS-x86_64", -"2.2.35-9-Windows", -"2.2.35-10-Linux-i686", -"2.2.35-10-Linux-x86_64", +"2.2.35-11-MacOS-i386", +"2.2.35-11-MacOS-x86_64", +"2.2.35-11-Windows", +"2.2.35-11-Linux-i686", +"2.2.35-11-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386", "2.3.12-alpha-2-Windows", "2.3.12-alpha-2-Linux-i386",

1 0