- tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 11 May '16

11 May '16

commit e31980f693b569541aded815a504eb62a76649d9 Merge: 84af12e 50249c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:23:40 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug18841_1_025' into maint-0.2.7
by nickm＠torproject.org 11 May '16

11 May '16

commit 039fc8427a512efce87b7bd21c10c4adca4ba30d Merge: 61c0bae c662bef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:22:36 2016 -0400 Merge branch 'bug18841_1_025' into maint-0.2.7 changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 11 May '16

11 May '16

commit 50249c7cd97c982fe829a9e7a22e660658b4e217 Merge: 5cd5979 039fc84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:23:20 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc configure.ac index e4816fd,8107c90..a487948 --- a/configure.ac +++ b/configure.ac @@@ -760,9 -717,9 +760,9 @@@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], #error #endif])], have_clang=yes, have_clang=no) -if test x$enable_gcc_hardening != xno; then +if test "x$enable_gcc_hardening" != "xno"; then - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" - if test x$have_clang = xyes; then + if test "x$have_clang" = "xyes"; then TOR_CHECK_CFLAGS(-Qunused-arguments) fi TOR_CHECK_CFLAGS(-fstack-protector-all, also_link)

1 0

[tor/maint-0.2.7] Undefine _FORTIFY_SOURCE before defining it.
by nickm＠torproject.org 11 May '16

11 May '16

commit c662bef45595e40106becfbdbb39811300d15a7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:15:37 2016 -0400 Undefine _FORTIFY_SOURCE before defining it. This makes our compilation options checks in autoconf work better on systems that already define _FORTIFY_SOURCE. Fixes at least one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from "trudokal". --- changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug18841.1 b/changes/bug18841.1 new file mode 100644 index 0000000..205ee5a --- /dev/null +++ b/changes/bug18841.1 @@ -0,0 +1,7 @@ + o Major bugfixes (compilation): + - Correctly detect compiler flags on systems where _FORTIFY_SOURCE + is predefined. Previously, our use of -D_FORTIFY_SOURCE would + cause a compiler warning, thereby making other checks fail. + Fixes one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from + "trudokal". + diff --git a/configure.ac b/configure.ac index 29ba2fd..2116b41 100644 --- a/configure.ac +++ b/configure.ac @@ -623,7 +623,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #endif])], have_clang=yes, have_clang=no) if test x$enable_gcc_hardening != xno; then - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" if test x$have_clang = xyes; then TOR_CHECK_CFLAGS(-Qunused-arguments) fi

1 0

[tor/maint-0.2.7] Merge branch 'bug18841_1_025' into maint-0.2.7
by nickm＠torproject.org 11 May '16

11 May '16

commit 039fc8427a512efce87b7bd21c10c4adca4ba30d Merge: 61c0bae c662bef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:22:36 2016 -0400 Merge branch 'bug18841_1_025' into maint-0.2.7 changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.8] Undefine _FORTIFY_SOURCE before defining it.
by nickm＠torproject.org 11 May '16

11 May '16

commit c662bef45595e40106becfbdbb39811300d15a7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:15:37 2016 -0400 Undefine _FORTIFY_SOURCE before defining it. This makes our compilation options checks in autoconf work better on systems that already define _FORTIFY_SOURCE. Fixes at least one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from "trudokal". --- changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug18841.1 b/changes/bug18841.1 new file mode 100644 index 0000000..205ee5a --- /dev/null +++ b/changes/bug18841.1 @@ -0,0 +1,7 @@ + o Major bugfixes (compilation): + - Correctly detect compiler flags on systems where _FORTIFY_SOURCE + is predefined. Previously, our use of -D_FORTIFY_SOURCE would + cause a compiler warning, thereby making other checks fail. + Fixes one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from + "trudokal". + diff --git a/configure.ac b/configure.ac index 29ba2fd..2116b41 100644 --- a/configure.ac +++ b/configure.ac @@ -623,7 +623,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #endif])], have_clang=yes, have_clang=no) if test x$enable_gcc_hardening != xno; then - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" if test x$have_clang = xyes; then TOR_CHECK_CFLAGS(-Qunused-arguments) fi

1 0

[tor/maint-0.2.8] Merge branch 'bug18841_1_025' into maint-0.2.7
by nickm＠torproject.org 11 May '16

11 May '16

commit 039fc8427a512efce87b7bd21c10c4adca4ba30d Merge: 61c0bae c662bef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:22:36 2016 -0400 Merge branch 'bug18841_1_025' into maint-0.2.7 changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 May '16

11 May '16

commit e0da985eac51245f033a7b10eee0a09e43f79946 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 11 16:15:20 2016 +0000 Update translations for https_everywhere_completed --- ca/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ssl-observatory.dtd b/ca/ssl-observatory.dtd index dc44b2e..afbccbe 100644 --- a/ca/ssl-observatory.dtd +++ b/ca/ssl-observatory.dtd @@ -39,7 +39,7 @@ xarxa corporativa molt intrusiva."> "Aquesta opció requereix que Tor estigui instal·lat i en funcionament"> <!ENTITY ssl-observatory.prefs.asn -"Quan vegis un certificat nou avisa al Observatori al que la teva ISP estigui connectada."> +"Quan vegis un certificat nou, avisa a l'Observatori al qual estigui connectada el teu ISP."> <!ENTITY ssl-observatory.prefs.asn_tooltip "Perseguirà i enviarà el "Número de Sistema Autònom" de la teva xarxa. Això ens permetrà a localitzar atacs en contra HTTPS, i determinar si detectem de xarxes en llocs com Israel o els USA d'on els atacs són comparativament mnés comuns.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 May '16

11 May '16

commit b39fc53839777fdcf6b6eb0bd1a4c2544d59f769 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 11 16:15:16 2016 +0000 Update translations for https_everywhere --- ca/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/ssl-observatory.dtd b/ca/ssl-observatory.dtd index dc44b2e..afbccbe 100644 --- a/ca/ssl-observatory.dtd +++ b/ca/ssl-observatory.dtd @@ -39,7 +39,7 @@ xarxa corporativa molt intrusiva."> "Aquesta opció requereix que Tor estigui instal·lat i en funcionament"> <!ENTITY ssl-observatory.prefs.asn -"Quan vegis un certificat nou avisa al Observatori al que la teva ISP estigui connectada."> +"Quan vegis un certificat nou, avisa a l'Observatori al qual estigui connectada el teu ISP."> <!ENTITY ssl-observatory.prefs.asn_tooltip "Perseguirà i enviarà el "Número de Sistema Autònom" de la teva xarxa. Això ens permetrà a localitzar atacs en contra HTTPS, i determinar si detectem de xarxes en llocs com Israel o els USA d'on els atacs són comparativament mnés comuns.">

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 11 May '16

11 May '16

commit c8cd4e5730dddf414ce85df2ec9c95fc2bf29a3d Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 11 15:45:49 2016 +0000 Update translations for abouttor-homepage_completed --- ca/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd index da9f699..dbcd0ff 100644 --- a/ca/aboutTor.dtd +++ b/ca/aboutTor.dtd @@ -37,7 +37,7 @@ <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Pots Ajudar!"> <!ENTITY aboutTor.helpInfo2.label "Hi ha moltes maneres en què pots ajudar per a fer la Xarxa Tor més ràpida i forta:"> -<!ENTITY aboutTor.helpInfo3.label "Usa un Node Tor Relay »"> +<!ENTITY aboutTor.helpInfo3.label "Executa un Node de Retransmissió Tor »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Ofereix els teus Serveis »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0