May 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 10 May '18

10 May '18

commit 59812789f7b16647762a7a79fc6db381e945a701 Merge: abde29824 e5acbbd16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:03:04 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Having a ControlPort open doesn't mean we are a client
by nickm＠torproject.org 10 May '18

10 May '18

commit bca8a104b291c0f475c87905e0dc958978776ecb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 9 12:40:06 2018 -0400 Having a ControlPort open doesn't mean we are a client The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 000000000..1ee49d860 --- /dev/null +++ b/changes/ticket26062 @@ -0,0 +1,3 @@ + o Minor bugfixes (client): + - Don't consider Tor running as a client if the ControlPort is open. Fixes + bug 26062; bugfix on 0.2.9.4-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index d9ae32560..d8e2c0027 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1584,7 +1584,6 @@ any_client_port_set(const or_options_t *options) return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || options->DNSPort_set); }

1 0

[tor/maint-0.2.9] Having a ControlPort open doesn't mean we are a client
by nickm＠torproject.org 10 May '18

10 May '18

commit bca8a104b291c0f475c87905e0dc958978776ecb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 9 12:40:06 2018 -0400 Having a ControlPort open doesn't mean we are a client The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 000000000..1ee49d860 --- /dev/null +++ b/changes/ticket26062 @@ -0,0 +1,3 @@ + o Minor bugfixes (client): + - Don't consider Tor running as a client if the ControlPort is open. Fixes + bug 26062; bugfix on 0.2.9.4-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index d9ae32560..d8e2c0027 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1584,7 +1584,6 @@ any_client_port_set(const or_options_t *options) return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || options->DNSPort_set); }

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 10 May '18

10 May '18

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3 Merge: 6361a250f bca8a104b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Having a ControlPort open doesn't mean we are a client
by nickm＠torproject.org 10 May '18

10 May '18

commit bca8a104b291c0f475c87905e0dc958978776ecb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 9 12:40:06 2018 -0400 Having a ControlPort open doesn't mean we are a client The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 000000000..1ee49d860 --- /dev/null +++ b/changes/ticket26062 @@ -0,0 +1,3 @@ + o Minor bugfixes (client): + - Don't consider Tor running as a client if the ControlPort is open. Fixes + bug 26062; bugfix on 0.2.9.4-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index d9ae32560..d8e2c0027 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1584,7 +1584,6 @@ any_client_port_set(const or_options_t *options) return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || options->DNSPort_set); }

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 10 May '18

10 May '18

commit e5acbbd16d29a5d3187bf2867c4ffa15451669bb Merge: 394f102ea aa08c1970 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:02:10 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc src/or/networkstatus.c index dd82f6681,fdaa469fa..3d99dd9ee --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -1654,9 -1685,7 +1654,8 @@@ any_client_port_set(const or_options_t return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || - options->DNSPort_set); + options->DNSPort_set || + options->HTTPTunnelPort_set); } /**

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 10 May '18

10 May '18

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3 Merge: 6361a250f bca8a104b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Having a ControlPort open doesn't mean we are a client
by nickm＠torproject.org 10 May '18

10 May '18

commit bca8a104b291c0f475c87905e0dc958978776ecb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 9 12:40:06 2018 -0400 Having a ControlPort open doesn't mean we are a client The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 000000000..1ee49d860 --- /dev/null +++ b/changes/ticket26062 @@ -0,0 +1,3 @@ + o Minor bugfixes (client): + - Don't consider Tor running as a client if the ControlPort is open. Fixes + bug 26062; bugfix on 0.2.9.4-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index d9ae32560..d8e2c0027 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1584,7 +1584,6 @@ any_client_port_set(const or_options_t *options) return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || options->DNSPort_set); }

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 10 May '18

10 May '18

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3 Merge: 6361a250f bca8a104b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 10 May '18

10 May '18

commit 59812789f7b16647762a7a79fc6db381e945a701 Merge: abde29824 e5acbbd16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:03:04 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0