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

[tor/master] Merge remote-tracking branch 'tor-github/pr/659'
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 0fc5fdc430968a62a0310fc7022c4562b4625bf2 Merge: c3fca4e4b 2529b29a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:55:53 2019 -0500 Merge remote-tracking branch 'tor-github/pr/659' changes/ticket29070 | 2 ++ contrib/client-tools/torify | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 97e1539f7f70898ac928f598bf711b7c317d29b7 Merge: 4df31adef 6fdd34acd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:53:02 2019 -0500 Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0 changes/ticket29072 | 2 ++ contrib/or-tools/check-tor | 41 ----------------------------------------- 2 files changed, 2 insertions(+), 41 deletions(-)

1 0

[tor/maint-0.4.0] Remove check-tor script
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 6fdd34acd69e6e54562855acffa23df0cec2aee2 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Feb 15 19:18:24 2019 +0200 Remove check-tor script --- changes/ticket29072 | 2 ++ contrib/or-tools/check-tor | 41 ----------------------------------------- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/changes/ticket29072 b/changes/ticket29072 new file mode 100644 index 000000000..3526330f3 --- /dev/null +++ b/changes/ticket29072 @@ -0,0 +1,2 @@ + o Removed features: + - Remove check-tor script from repository. Resolves issue 29072. diff --git a/contrib/or-tools/check-tor b/contrib/or-tools/check-tor deleted file mode 100755 index e981a35fc..000000000 --- a/contrib/or-tools/check-tor +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -## Originally written by Peter Palfrader. - -## This script lets you quickly check if a given router (by nickname) -## will let you do a TLS handshake, or will let you download a directory. - -## Usage: check-tor nickname - -#set -x - -router="$1" -dirserver="http://belegost.seul.org:80/tor/" - -lines=$( wget -q $dirserver --proxy=off -O - | grep -A5 '^router '"$router"' ' ) -line=$( echo "$lines" | head -n1 ) - -if [ -z "$line" ]; then - echo "Not found" >&2 - exit 1 -fi - -echo "$lines" -echo - -ipor=$( echo "$line" | awk '{printf "%s:%s", $3, $4}' ) - -op=$( echo "$line" | awk '{printf $6}' ) -ipop=$( echo "$line" | awk '{printf "%s:%s", $3, $6}' ) - -echo -echo ">>" openssl s_client -connect "$ipor" -timeout 5 openssl s_client -connect "$ipor" < /dev/null -if [ "$op" != "0" ]; then - echo - echo ">>" wget --proxy=off -O - http://$ipop/tor/ - timeout 5 wget --proxy=off -O - http://$ipop/tor/ | head -n3 -fi - -echo -echo -n "$router "; echo "$lines" | grep 'fingerprint' | sed -e 's/^opt //' -e 's/^fingerprint //';

1 0

[tor/master] kist: When readding chans, check correct chan's sched_heap_idx
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit b054a6c6b9cdda5c35b905f98ff092f15d8b749d Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Feb 14 16:18:58 2019 -0500 kist: When readding chans, check correct chan's sched_heap_idx Closes #29508 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug29508 b/changes/bug29508 new file mode 100644 index 000000000..ee728bbbc --- /dev/null +++ b/changes/bug29508 @@ -0,0 +1,3 @@ + o Minor bugfixes (scheduler): + - When readding channels to the pending list, check the correct channel's + sched_heap_idx. Fixes bug 29508; bugfix on 0.3.2.10 diff --git a/src/core/or/scheduler_kist.c b/src/core/or/scheduler_kist.c index 34e567207..01be751ad 100644 --- a/src/core/or/scheduler_kist.c +++ b/src/core/or/scheduler_kist.c @@ -724,7 +724,7 @@ kist_scheduler_run(void) SMARTLIST_FOREACH_BEGIN(to_readd, channel_t *, readd_chan) { scheduler_set_channel_state(readd_chan, SCHED_CHAN_PENDING); if (!smartlist_contains(cp, readd_chan)) { - if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + if (!SCHED_BUG(readd_chan->sched_heap_idx != -1, readd_chan)) { /* XXXX Note that the check above is in theory redundant with * the smartlist_contains check. But let's make sure we're * not messing anything up, and leave them both for now. */

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4df31adef7ada9221de7e39430a34234dd3fc6cb Merge: 4bc55ed5e b054a6c6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:51:19 2019 -0500 Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0 changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit c3fca4e4b324aae9be7ebe2077eb50dcbe5f1ac4 Merge: f70929347 4df31adef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:51:24 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] kist: When readding chans, check correct chan's sched_heap_idx
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit b054a6c6b9cdda5c35b905f98ff092f15d8b749d Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Feb 14 16:18:58 2019 -0500 kist: When readding chans, check correct chan's sched_heap_idx Closes #29508 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug29508 b/changes/bug29508 new file mode 100644 index 000000000..ee728bbbc --- /dev/null +++ b/changes/bug29508 @@ -0,0 +1,3 @@ + o Minor bugfixes (scheduler): + - When readding channels to the pending list, check the correct channel's + sched_heap_idx. Fixes bug 29508; bugfix on 0.3.2.10 diff --git a/src/core/or/scheduler_kist.c b/src/core/or/scheduler_kist.c index 34e567207..01be751ad 100644 --- a/src/core/or/scheduler_kist.c +++ b/src/core/or/scheduler_kist.c @@ -724,7 +724,7 @@ kist_scheduler_run(void) SMARTLIST_FOREACH_BEGIN(to_readd, channel_t *, readd_chan) { scheduler_set_channel_state(readd_chan, SCHED_CHAN_PENDING); if (!smartlist_contains(cp, readd_chan)) { - if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + if (!SCHED_BUG(readd_chan->sched_heap_idx != -1, readd_chan)) { /* XXXX Note that the check above is in theory redundant with * the smartlist_contains check. But let's make sure we're * not messing anything up, and leave them both for now. */

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4df31adef7ada9221de7e39430a34234dd3fc6cb Merge: 4bc55ed5e b054a6c6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:51:19 2019 -0500 Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0 changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] kist: When readding chans, check correct chan's sched_heap_idx
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit b054a6c6b9cdda5c35b905f98ff092f15d8b749d Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Feb 14 16:18:58 2019 -0500 kist: When readding chans, check correct chan's sched_heap_idx Closes #29508 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug29508 b/changes/bug29508 new file mode 100644 index 000000000..ee728bbbc --- /dev/null +++ b/changes/bug29508 @@ -0,0 +1,3 @@ + o Minor bugfixes (scheduler): + - When readding channels to the pending list, check the correct channel's + sched_heap_idx. Fixes bug 29508; bugfix on 0.3.2.10 diff --git a/src/core/or/scheduler_kist.c b/src/core/or/scheduler_kist.c index 34e567207..01be751ad 100644 --- a/src/core/or/scheduler_kist.c +++ b/src/core/or/scheduler_kist.c @@ -724,7 +724,7 @@ kist_scheduler_run(void) SMARTLIST_FOREACH_BEGIN(to_readd, channel_t *, readd_chan) { scheduler_set_channel_state(readd_chan, SCHED_CHAN_PENDING); if (!smartlist_contains(cp, readd_chan)) { - if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + if (!SCHED_BUG(readd_chan->sched_heap_idx != -1, readd_chan)) { /* XXXX Note that the check above is in theory redundant with * the smartlist_contains check. But let's make sure we're * not messing anything up, and leave them both for now. */

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 4df31adef7ada9221de7e39430a34234dd3fc6cb Merge: 4bc55ed5e b054a6c6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:51:19 2019 -0500 Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0 changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0