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

[tor/maint-0.4.0] Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit 5ec65be8bff9862d31f612bdd28c0b0d78b1f5cf Merge: ccab4347e d32e40797 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:39:28 2019 -0500 Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0 src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

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

20 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/master] fix typos from #28614
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit 249319ec5d3a17faf9a6060f1b3109f640874863 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:32:47 2019 -0500 fix typos from #28614 --- changes/ticket28614 | 2 +- src/feature/nodelist/networkstatus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/ticket28614 b/changes/ticket28614 index 6c65ce49d..3c9331372 100644 --- a/changes/ticket28614 +++ b/changes/ticket28614 @@ -3,6 +3,6 @@ "binary" mode so that we can safely map it into memory later. Fixes part of bug 28614; bugfix on 0.4.0.1-alpha. - When reading a consensus file from disk, detect whether it - was written in text mode, and re-read it in text mode if it + was written in text mode, and re-read it in text mode if so. Fixes part of bug 28614; bugfix on 0.4.0.1-alpha. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 2c3475462..023115978 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1743,7 +1743,7 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c, #endif /* defined(TOR_UNIT_TESTS) */ /** - * Helper: Read a the current consensus of type flavor from + * Helper: Read the current consensus of type flavor from * fname. Flags and return values are as for * networkstatus_set_current_consensus(). **/

1 0

[tor/master] Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit ccab4347e592116fcbc0faa42dcfaf7eaa6fe715 Merge: 249319ec5 c9ff6a7f8 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:35:56 2019 -0500 Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0 src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Remove check-tor script
by arma＠torproject.org 20 Feb '19

20 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] Mark map_anon_nofork test as skipped in 0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit c9ff6a7f834e25a93c806d0079b789d26b11695a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 13:14:26 2019 -0500 Mark map_anon_nofork test as skipped in 0.4.0 This test fails in some environments; since the code isn't used in 0.4.0, let's disable it for now. Band-aid solution for #29534; bug not in any released Tor. --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 913c5e289..7a2708c54 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6360,6 +6360,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(get_unquoted_path, 0), UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), - UTIL_TEST(map_anon_nofork, 0), + UTIL_TEST(map_anon_nofork, TT_SKIP /* See bug #29535 */), END_OF_TESTCASES };

1 0

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

20 Feb '19

commit 4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb Merge: 6927e9a60 ccab4347e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:36:54 2019 -0500 Merge branch 'maint-0.4.0' changes/ticket28614 | 2 +- changes/ticket29072 | 2 ++ contrib/or-tools/check-tor | 41 ------------------------------------ src/feature/nodelist/networkstatus.c | 2 +- src/test/test_util.c | 2 +- 5 files changed, 5 insertions(+), 44 deletions(-)

1 0

[tor/release-0.4.0] Remove check-tor script
by arma＠torproject.org 20 Feb '19

20 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/release-0.4.0] fix typos from #28614
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit 249319ec5d3a17faf9a6060f1b3109f640874863 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:32:47 2019 -0500 fix typos from #28614 --- changes/ticket28614 | 2 +- src/feature/nodelist/networkstatus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/ticket28614 b/changes/ticket28614 index 6c65ce49d..3c9331372 100644 --- a/changes/ticket28614 +++ b/changes/ticket28614 @@ -3,6 +3,6 @@ "binary" mode so that we can safely map it into memory later. Fixes part of bug 28614; bugfix on 0.4.0.1-alpha. - When reading a consensus file from disk, detect whether it - was written in text mode, and re-read it in text mode if it + was written in text mode, and re-read it in text mode if so. Fixes part of bug 28614; bugfix on 0.4.0.1-alpha. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 2c3475462..023115978 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1743,7 +1743,7 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c, #endif /* defined(TOR_UNIT_TESTS) */ /** - * Helper: Read a the current consensus of type flavor from + * Helper: Read the current consensus of type flavor from * fname. Flags and return values are as for * networkstatus_set_current_consensus(). **/

1 0

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

20 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