January 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'ticket28843'
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 578a93bbbc9ecb6fa67aead760bfeb40e7977d39 Merge: 0ed966fde 4bc3983f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 9 09:49:25 2019 -0500 Merge branch 'ticket28843' changes/ticket28843 | 3 +++ src/feature/control/control.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 09 Jan '19

09 Jan '19

commit 673ea0a870811d6e0e9839a3932612f2779a4a74 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 9 14:45:48 2019 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 116448576..1d549a019 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Faire un don à la FFÉ"> <!ENTITY https-everywhere.menu.observatory "Préférences de l’observatoire SSL "> <!ENTITY https-everywhere.menu.globalEnable "Activer HTTPS partout"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Bloquer toutes les requêtes non chiffrées"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Chiffrer tous les sites admissibles (EASE)"> <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Jan '19

09 Jan '19

commit 6400a62d90417f799fac22b2e946bdb5c5d1d3d6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 9 14:45:42 2019 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 71486cf27..1d549a019 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Faire un don à la FFÉ"> <!ENTITY https-everywhere.menu.observatory "Préférences de l’observatoire SSL "> <!ENTITY https-everywhere.menu.globalEnable "Activer HTTPS partout"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible (EASE)"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Chiffrer tous les sites admissibles (EASE)"> <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles">

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 694e3c57fd1af2cdaa4650d69c50f4108a8612f6 Merge: 380ae2b74 c59b572e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 9 09:38:22 2019 -0500 Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5 changes/bug28995 | 5 +++++ src/lib/net/socketpair.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Fix tor_ersatz_socketpair on IPv6-only systems
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit c59b572e934ec501cf7db78d10e36a6cf984b97b Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 7 17:28:21 2019 -0600 Fix tor_ersatz_socketpair on IPv6-only systems In get_local_listener used by tor_ersatz_socketpair, the address family used when binding the IPv6 socket was AF_INET instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug28995 | 5 +++++ src/lib/net/socketpair.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug28995 b/changes/bug28995 new file mode 100644 index 000000000..f76b6a085 --- /dev/null +++ b/changes/bug28995 @@ -0,0 +1,5 @@ + o Minor bugfix (IPv6): + Fix tor_ersatz_socketpair on IPv6-only systems. Previously, + the IPv6 socket was bound using an address family of AF_INET + instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn. diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c index 380338f15..6a21581d8 100644 --- a/src/lib/net/socketpair.c +++ b/src/lib/net/socketpair.c @@ -62,7 +62,7 @@ get_local_listener(int family, int type) len = sizeof(sin); } else { sa = (struct sockaddr *) &sin6; - sin6.sin6_family = AF_INET; + sin6.sin6_family = AF_INET6; sin6.sin6_addr.s6_addr[15] = 1; len = sizeof(sin6); }

1 0

[tor/master] Fix tor_ersatz_socketpair on IPv6-only systems
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit c59b572e934ec501cf7db78d10e36a6cf984b97b Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 7 17:28:21 2019 -0600 Fix tor_ersatz_socketpair on IPv6-only systems In get_local_listener used by tor_ersatz_socketpair, the address family used when binding the IPv6 socket was AF_INET instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug28995 | 5 +++++ src/lib/net/socketpair.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug28995 b/changes/bug28995 new file mode 100644 index 000000000..f76b6a085 --- /dev/null +++ b/changes/bug28995 @@ -0,0 +1,5 @@ + o Minor bugfix (IPv6): + Fix tor_ersatz_socketpair on IPv6-only systems. Previously, + the IPv6 socket was bound using an address family of AF_INET + instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn. diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c index 380338f15..6a21581d8 100644 --- a/src/lib/net/socketpair.c +++ b/src/lib/net/socketpair.c @@ -62,7 +62,7 @@ get_local_listener(int family, int type) len = sizeof(sin); } else { sa = (struct sockaddr *) &sin6; - sin6.sin6_family = AF_INET; + sin6.sin6_family = AF_INET6; sin6.sin6_addr.s6_addr[15] = 1; len = sizeof(sin6); }

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 694e3c57fd1af2cdaa4650d69c50f4108a8612f6 Merge: 380ae2b74 c59b572e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 9 09:38:22 2019 -0500 Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5 changes/bug28995 | 5 +++++ src/lib/net/socketpair.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 0ed966fde111a892e3d0010cea3fd165b0c7972f Merge: d890ec29a 694e3c57f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 9 09:38:27 2019 -0500 Merge branch 'maint-0.3.5' changes/bug28995 | 5 +++++ src/lib/net/socketpair.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 830b659fedf52ad81554328a0601a5502a8ea72f Merge: 7db07d674 694e3c57f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 9 09:38:27 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28995 | 5 +++++ src/lib/net/socketpair.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Fix tor_ersatz_socketpair on IPv6-only systems
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit c59b572e934ec501cf7db78d10e36a6cf984b97b Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 7 17:28:21 2019 -0600 Fix tor_ersatz_socketpair on IPv6-only systems In get_local_listener used by tor_ersatz_socketpair, the address family used when binding the IPv6 socket was AF_INET instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug28995 | 5 +++++ src/lib/net/socketpair.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug28995 b/changes/bug28995 new file mode 100644 index 000000000..f76b6a085 --- /dev/null +++ b/changes/bug28995 @@ -0,0 +1,5 @@ + o Minor bugfix (IPv6): + Fix tor_ersatz_socketpair on IPv6-only systems. Previously, + the IPv6 socket was bound using an address family of AF_INET + instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn. diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c index 380338f15..6a21581d8 100644 --- a/src/lib/net/socketpair.c +++ b/src/lib/net/socketpair.c @@ -62,7 +62,7 @@ get_local_listener(int family, int type) len = sizeof(sin); } else { sa = (struct sockaddr *) &sin6; - sin6.sin6_family = AF_INET; + sin6.sin6_family = AF_INET6; sin6.sin6_addr.s6_addr[15] = 1; len = sizeof(sin6); }

1 0