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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Mar '13

18 Mar '13

commit d84bc6ea374f7f4875c58edd3e5cb7b11c46c01e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 18 19:45:59 2013 +0000 Update translations for https_everywhere --- fi/https-everywhere.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fi/https-everywhere.properties b/fi/https-everywhere.properties index 5dc16d6..2a03cbe 100644 --- a/fi/https-everywhere.properties +++ b/fi/https-everywhere.properties @@ -3,4 +3,4 @@ https-everywhere.menu.globalDisable = Poista HTTPS Everywhere käytöstä https-everywhere.menu.enableDisable = Ota sääntöjä käyttöön / poista käytöstä https-everywhere.menu.noRules = (Tälle sivulle ei ole sääntöjä) https-everywhere.menu.unknownRules = (Sivun sääntöä ei tunnistettu) -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. +https-everywhere.toolbar.hint = HTTPS Everywhere on käytössä. Voit valita, millä sivustoilla ohjelmaa käytetään, kun napsautat osoiterivissä olevaa kuvaketta.

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug6164' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783 Merge: 0b827cb 5d2b2b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:45:49 2013 -0400 Merge remote-tracking branch 'public/bug6164' into maint-0.2.4 src/or/dirserv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Clear up a comment about when an assertion could fire
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 5d2b2b9ede6ea0f247b5505d7e30a622c312e9fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 16:23:58 2013 -0500 Clear up a comment about when an assertion could fire Resolves ticket 6164 --- src/or/dirserv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index badacd6..49fee88 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2216,9 +2216,10 @@ routerstatus_format_entry(char *buf, size_t buf_len, return -1; } - /* This assert can fire for the control port, because + /* This assert could fire for the control port, because * it can request NS documents before all descriptors - * have been fetched. */ + * have been fetched. Therefore, we only do this test when + * format != NS_CONTROL_PORT. */ if (tor_memneq(desc->cache_info.signed_descriptor_digest, rs->descriptor_digest, DIGEST_LEN)) {

1 0

[tor/master] Fix another case of bug 8206; patch from flupzor
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 0b827cbcb11abece686d402170bd58724a77e365 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:44:23 2013 -0400 Fix another case of bug 8206; patch from flupzor --- src/common/compat.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 25df9a9..4fa9fee 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1172,10 +1172,22 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) return -errno; #if defined(FD_CLOEXEC) - if (SOCKET_OK(fd[0])) - fcntl(fd[0], F_SETFD, FD_CLOEXEC); - if (SOCKET_OK(fd[1])) - fcntl(fd[1], F_SETFD, FD_CLOEXEC); + if (SOCKET_OK(fd[0])) { + r = fcntl(fd[0], F_SETFD, FD_CLOEXEC); + if (r == -1) { + close(fd[0]); + close(fd[1]); + return -errno; + } + } + if (SOCKET_OK(fd[1])) { + r = fcntl(fd[1], F_SETFD, FD_CLOEXEC); + if (r == -1) { + close(fd[0]); + close(fd[1]); + return -errno; + } + } #endif goto sockets_ok; /* So that sockets_ok will not be unused. */

1 0

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

18 Mar '13

commit e5b79b5bb5b699388e6d3016f284a7a3f530c7c9 Merge: 19d6650 0b827cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:44:45 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/common/compat.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.4] Fix another case of bug 8206; patch from flupzor
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 0b827cbcb11abece686d402170bd58724a77e365 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:44:23 2013 -0400 Fix another case of bug 8206; patch from flupzor --- src/common/compat.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 25df9a9..4fa9fee 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1172,10 +1172,22 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) return -errno; #if defined(FD_CLOEXEC) - if (SOCKET_OK(fd[0])) - fcntl(fd[0], F_SETFD, FD_CLOEXEC); - if (SOCKET_OK(fd[1])) - fcntl(fd[1], F_SETFD, FD_CLOEXEC); + if (SOCKET_OK(fd[0])) { + r = fcntl(fd[0], F_SETFD, FD_CLOEXEC); + if (r == -1) { + close(fd[0]); + close(fd[1]); + return -errno; + } + } + if (SOCKET_OK(fd[1])) { + r = fcntl(fd[1], F_SETFD, FD_CLOEXEC); + if (r == -1) { + close(fd[0]); + close(fd[1]); + return -errno; + } + } #endif goto sockets_ok; /* So that sockets_ok will not be unused. */

1 0

[tor/master] Merge remote-tracking branch 'public/bug6673' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9 Merge: ad8a27a fdafe11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:40:50 2013 -0400 Merge remote-tracking branch 'public/bug6673' into maint-0.2.4 changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-)

1 0

[tor/master] Give an #error when we want threads and OpenSSL has disabled threads
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit fdafe11a25ad3e7ca8893c8630f86973431217b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 13:23:10 2013 -0400 Give an #error when we want threads and OpenSSL has disabled threads Fixes ticket 6673. --- changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug6673 b/changes/bug6673 new file mode 100644 index 0000000..506b449 --- /dev/null +++ b/changes/bug6673 @@ -0,0 +1,4 @@ + o Minor features (build): + - Detect and reject attempts to build Tor with threading support + when OpenSSL have been compiled with threading support disabled. + Fixes bug 6673. diff --git a/src/common/crypto.c b/src/common/crypto.c index 22d57c7..3d8b1ba 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3000,6 +3000,12 @@ memwipe(void *mem, uint8_t byte, size_t sz) } #ifdef TOR_IS_MULTITHREADED + +#ifndef OPENSSL_THREADS +#error OpenSSL has been built without thread support. Tor requires an \ + OpenSSL library with thread support enabled. +#endif + /** Helper: OpenSSL uses this callback to manipulate mutexes. */ static void openssl_locking_cb_(int mode, int n, const char *file, int line)

1 0

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

18 Mar '13

commit 19d6650f8175744a8bd0153201ddc7d222a925af Merge: c8c86c9 eff1cfa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:41:14 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug6673' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9 Merge: ad8a27a fdafe11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:40:50 2013 -0400 Merge remote-tracking branch 'public/bug6673' into maint-0.2.4 changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-)

1 0