October 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit cf98ca715c0899b5d0f9617cd4a7eb2e3a128fb9 Merge: 332d6bf90 7c59c751b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.2' changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit fecc5c61fc647fd2a87c2e5b999e139c0b11e29c Merge: e1af8fd61 04d4786cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit f2e23d38ab109ea8d5be0d6b9e9edad4528ff68a Merge: 6ce8cc5db 04d4786cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.0] Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 04d4786cc40b2d80b4cd34e7d5339b0100861c8f Merge: 151d5eded c50c98ba6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:07 2017 -0400 Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c346c892a42558cf748c9743c5c3ef58583875ed Merge: 4d73ed10c f2e23d38a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.0] Make changes in server_mode() affect workers; fix a crash.
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c50c98ba6a3eae0b9a3a19c4a3498809080d7ac0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 2 11:11:30 2017 -0400 Make changes in server_mode() affect workers; fix a crash. Without this fix, changes from client to bridge don't trigger transition_affects_workers(), so we would never have actually initialized the cpuworkers. Fixes bug 23693. Bugfix on 3bcdb26267502e0 0.2.6.3-alpha, which fixed bug 14901 in the general case, but not on the case where public_server_mode() did not change. --- changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+) diff --git a/changes/bug23693 b/changes/bug23693 new file mode 100644 index 000000000..796398be5 --- /dev/null +++ b/changes/bug23693 @@ -0,0 +1,6 @@ + o Minor bugfixes (relay, crash): + - Avoid a crash when transitioning from client mode to bridge mode. + Previously, we would launch the worker threads whenever our "public + server" mode changed, but not when our "server" mode changed. + Fixes bug 23693; bugfix on 0.2.6.3-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 2e001ee5a..23c566c6c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4453,6 +4453,7 @@ options_transition_affects_workers(const or_options_t *old_options, new_options->ServerDNSSearchDomains || old_options->SafeLogging_ != new_options->SafeLogging_ || old_options->ClientOnly != new_options->ClientOnly || + server_mode(old_options) != server_mode(new_options) || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) || old_options->LogMessageDomains != new_options->LogMessageDomains)

1 0

[tor/release-0.3.1] Make changes in server_mode() affect workers; fix a crash.
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c50c98ba6a3eae0b9a3a19c4a3498809080d7ac0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 2 11:11:30 2017 -0400 Make changes in server_mode() affect workers; fix a crash. Without this fix, changes from client to bridge don't trigger transition_affects_workers(), so we would never have actually initialized the cpuworkers. Fixes bug 23693. Bugfix on 3bcdb26267502e0 0.2.6.3-alpha, which fixed bug 14901 in the general case, but not on the case where public_server_mode() did not change. --- changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+) diff --git a/changes/bug23693 b/changes/bug23693 new file mode 100644 index 000000000..796398be5 --- /dev/null +++ b/changes/bug23693 @@ -0,0 +1,6 @@ + o Minor bugfixes (relay, crash): + - Avoid a crash when transitioning from client mode to bridge mode. + Previously, we would launch the worker threads whenever our "public + server" mode changed, but not when our "server" mode changed. + Fixes bug 23693; bugfix on 0.2.6.3-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 2e001ee5a..23c566c6c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4453,6 +4453,7 @@ options_transition_affects_workers(const or_options_t *old_options, new_options->ServerDNSSearchDomains || old_options->SafeLogging_ != new_options->SafeLogging_ || old_options->ClientOnly != new_options->ClientOnly || + server_mode(old_options) != server_mode(new_options) || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) || old_options->LogMessageDomains != new_options->LogMessageDomains)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 5a21b27083640aec1e23e21cdfcad02625659e05 Merge: 7c2f688fb f2e23d38a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 5a21b27083640aec1e23e21cdfcad02625659e05 Merge: 7c2f688fb f2e23d38a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.2] Make changes in server_mode() affect workers; fix a crash.
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c50c98ba6a3eae0b9a3a19c4a3498809080d7ac0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 2 11:11:30 2017 -0400 Make changes in server_mode() affect workers; fix a crash. Without this fix, changes from client to bridge don't trigger transition_affects_workers(), so we would never have actually initialized the cpuworkers. Fixes bug 23693. Bugfix on 3bcdb26267502e0 0.2.6.3-alpha, which fixed bug 14901 in the general case, but not on the case where public_server_mode() did not change. --- changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+) diff --git a/changes/bug23693 b/changes/bug23693 new file mode 100644 index 000000000..796398be5 --- /dev/null +++ b/changes/bug23693 @@ -0,0 +1,6 @@ + o Minor bugfixes (relay, crash): + - Avoid a crash when transitioning from client mode to bridge mode. + Previously, we would launch the worker threads whenever our "public + server" mode changed, but not when our "server" mode changed. + Fixes bug 23693; bugfix on 0.2.6.3-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 2e001ee5a..23c566c6c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4453,6 +4453,7 @@ options_transition_affects_workers(const or_options_t *old_options, new_options->ServerDNSSearchDomains || old_options->SafeLogging_ != new_options->SafeLogging_ || old_options->ClientOnly != new_options->ClientOnly || + server_mode(old_options) != server_mode(new_options) || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) || old_options->LogMessageDomains != new_options->LogMessageDomains)

1 0