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

[tor/master] Merge remote-tracking branch 'tor-github/pr/1780/head'
by nickm＠torproject.org 26 Mar '20

26 Mar '20

commit e7290dc8c00dcb765ac67bebb6e30a086903b859 Merge: cf58b0b36 4b964ef5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 26 10:38:08 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1780/head' src/feature/nodelist/routerlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Update comment in router_differences_are_cosmetic()
by nickm＠torproject.org 26 Mar '20

26 Mar '20

commit 4b964ef5b200b90e2e4d5005f732668862c9131d Author: Steven Engler <sengler(a)uwaterloo.ca> Date: Mon Mar 9 10:13:36 2020 -0400 Update comment in router_differences_are_cosmetic() Descriptor differences are cosmetic if 2 hours has passed, not 12 hours (see ticket 33573). --- src/feature/nodelist/routerlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index f4e1215a4..80c1aa689 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -2922,7 +2922,7 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2) (r1->bandwidthburst != r2->bandwidthburst)) return 0; - /* Did more than 12 hours pass? */ + /* Has enough time passed between the publication times? */ if (r1->cache_info.published_on + ROUTER_MAX_COSMETIC_TIME_DIFFERENCE < r2->cache_info.published_on) return 0;

1 0

[tor/master] Merge branch 'maint-0.4.3'
by dgoulet＠torproject.org 26 Mar '20

26 Mar '20

commit cf58b0b369605168c0c72994d600147fa477a5b1 Merge: b2cda3269 e47273729 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 26 09:15:01 2020 -0400 Merge branch 'maint-0.4.3' changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'tor-github/pr/1794' into maint-0.4.3
by dgoulet＠torproject.org 26 Mar '20

26 Mar '20

commit e472737297f5924a584fc8f434aba085e89b887a Merge: 03b0d1840 cc2fb91ea Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 26 09:14:25 2020 -0400 Merge branch 'tor-github/pr/1794' into maint-0.4.3 changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'tor-github/pr/1794' into maint-0.4.3
by dgoulet＠torproject.org 26 Mar '20

26 Mar '20

commit e472737297f5924a584fc8f434aba085e89b887a Merge: 03b0d1840 cc2fb91ea Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 26 09:14:25 2020 -0400 Merge branch 'tor-github/pr/1794' into maint-0.4.3 changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/master] connection: Stop forcing some ports to prefer IPv6
by dgoulet＠torproject.org 26 Mar '20

26 Mar '20

commit cc2fb91ea52fab733ee5ddde7c485854c5b170c3 Author: teor <teor(a)torproject.org> Date: Fri Mar 13 12:25:43 2020 +1000 connection: Stop forcing some ports to prefer IPv6 Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections. Instead, prefer IPv6 connections by default, but allow users to change their configs using the "NoPreferIPv6" port flag. Fixes bug 33608; bugfix on 0.4.3.1-alpha. --- changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug33608 b/changes/bug33608 new file mode 100644 index 000000000..0e82a8eec --- /dev/null +++ b/changes/bug33608 @@ -0,0 +1,5 @@ + o Minor bugfixes (client IPv6): + - Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections. Instead, + prefer IPv6 connections by default, but allow users to change their + configs using the "NoPreferIPv6" port flag. + Fixes bug 33608; bugfix on 0.4.3.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index bfd850da8..57b48d49f 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1514,10 +1514,11 @@ connection_listener_new(const struct sockaddr *listensockaddr, } } + /* Force IPv4 and IPv6 traffic on for non-SOCKSPorts. + * Forcing options on isn't a good idea, see #32994 and #33607. */ if (type != CONN_TYPE_AP_LISTENER) { lis_conn->entry_cfg.ipv4_traffic = 1; lis_conn->entry_cfg.ipv6_traffic = 1; - lis_conn->entry_cfg.prefer_ipv6 = 1; } if (connection_add(conn) < 0) { /* no space, forget it */

1 0

[tor/maint-0.4.3] connection: Stop forcing some ports to prefer IPv6
by dgoulet＠torproject.org 26 Mar '20

26 Mar '20

commit cc2fb91ea52fab733ee5ddde7c485854c5b170c3 Author: teor <teor(a)torproject.org> Date: Fri Mar 13 12:25:43 2020 +1000 connection: Stop forcing some ports to prefer IPv6 Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections. Instead, prefer IPv6 connections by default, but allow users to change their configs using the "NoPreferIPv6" port flag. Fixes bug 33608; bugfix on 0.4.3.1-alpha. --- changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug33608 b/changes/bug33608 new file mode 100644 index 000000000..0e82a8eec --- /dev/null +++ b/changes/bug33608 @@ -0,0 +1,5 @@ + o Minor bugfixes (client IPv6): + - Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections. Instead, + prefer IPv6 connections by default, but allow users to change their + configs using the "NoPreferIPv6" port flag. + Fixes bug 33608; bugfix on 0.4.3.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index bfd850da8..57b48d49f 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1514,10 +1514,11 @@ connection_listener_new(const struct sockaddr *listensockaddr, } } + /* Force IPv4 and IPv6 traffic on for non-SOCKSPorts. + * Forcing options on isn't a good idea, see #32994 and #33607. */ if (type != CONN_TYPE_AP_LISTENER) { lis_conn->entry_cfg.ipv4_traffic = 1; lis_conn->entry_cfg.ipv6_traffic = 1; - lis_conn->entry_cfg.prefer_ipv6 = 1; } if (connection_add(conn) < 0) { /* no space, forget it */

1 0

[tor/release-0.4.3] connection: Stop forcing some ports to prefer IPv6
by dgoulet＠torproject.org 26 Mar '20

26 Mar '20

commit cc2fb91ea52fab733ee5ddde7c485854c5b170c3 Author: teor <teor(a)torproject.org> Date: Fri Mar 13 12:25:43 2020 +1000 connection: Stop forcing some ports to prefer IPv6 Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections. Instead, prefer IPv6 connections by default, but allow users to change their configs using the "NoPreferIPv6" port flag. Fixes bug 33608; bugfix on 0.4.3.1-alpha. --- changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug33608 b/changes/bug33608 new file mode 100644 index 000000000..0e82a8eec --- /dev/null +++ b/changes/bug33608 @@ -0,0 +1,5 @@ + o Minor bugfixes (client IPv6): + - Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections. Instead, + prefer IPv6 connections by default, but allow users to change their + configs using the "NoPreferIPv6" port flag. + Fixes bug 33608; bugfix on 0.4.3.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index bfd850da8..57b48d49f 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1514,10 +1514,11 @@ connection_listener_new(const struct sockaddr *listensockaddr, } } + /* Force IPv4 and IPv6 traffic on for non-SOCKSPorts. + * Forcing options on isn't a good idea, see #32994 and #33607. */ if (type != CONN_TYPE_AP_LISTENER) { lis_conn->entry_cfg.ipv4_traffic = 1; lis_conn->entry_cfg.ipv6_traffic = 1; - lis_conn->entry_cfg.prefer_ipv6 = 1; } if (connection_add(conn) < 0) { /* no space, forget it */

1 0

[tor/release-0.4.3] Merge branch 'tor-github/pr/1794' into maint-0.4.3
by dgoulet＠torproject.org 26 Mar '20

26 Mar '20

commit e472737297f5924a584fc8f434aba085e89b887a Merge: 03b0d1840 cc2fb91ea Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 26 09:14:25 2020 -0400 Merge branch 'tor-github/pr/1794' into maint-0.4.3 changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by dgoulet＠torproject.org 26 Mar '20

26 Mar '20

commit 78ac7c751cf3051efe26f6c1e5fc7234bafe3942 Merge: 0c7725be8 e47273729 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 26 09:15:00 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0