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

[tor/release-0.3.5] Merge branch 'bug27968_squashed' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 996f24fcd31be197b8cfc9cb5dddd2b04a4cf3a2 Merge: 0ea508ec6 e36e4a967 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:14:32 2018 -0400 Merge branch 'bug27968_squashed' into maint-0.3.5 changes/bug27968 | 3 +++ src/test/test_rebind.py | 61 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 47 insertions(+), 17 deletions(-)

1 0

[tor/master] Fix shellcheck warning SC2086 in run_calltool.sh
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit eab81b12e92ea3ae53d14337a6fafc9d6c32b39a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 29 11:31:03 2018 +0200 Fix shellcheck warning SC2086 in run_calltool.sh --- scripts/maint/run_calltool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/run_calltool.sh b/scripts/maint/run_calltool.sh index efb8706fe..f36810f5b 100755 --- a/scripts/maint/run_calltool.sh +++ b/scripts/maint/run_calltool.sh @@ -15,7 +15,7 @@ SUBITEMS="fn_graph fn_invgraph fn_scc fn_scc_weaklinks module_graph module_invgr for calculation in $SUBITEMS; do echo "======== $calculation" - python -m calltool $calculation > callgraph/$calculation + python -m calltool "$calculation" > callgraph/"$calculation" done echo <<EOF > callgraph/README

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/449'
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit f27279f85766b71e106bc2d9c0624a7f95d7829a Merge: d671e3f51 5a3cb495c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:11:26 2018 -0400 Merge remote-tracking branch 'tor-github/pr/449' changes/ticket28011 | 3 +++ scripts/maint/run_calltool.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix shellcheck issue SC2217 in run_calltool.sh
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 6aef0ce94e9bfe5d3bd06f0a3349f9e8930218f5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 29 11:37:16 2018 +0200 Fix shellcheck issue SC2217 in run_calltool.sh --- scripts/maint/run_calltool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/run_calltool.sh b/scripts/maint/run_calltool.sh index f36810f5b..b0268322f 100755 --- a/scripts/maint/run_calltool.sh +++ b/scripts/maint/run_calltool.sh @@ -18,7 +18,7 @@ for calculation in $SUBITEMS; do python -m calltool "$calculation" > callgraph/"$calculation" done -echo <<EOF > callgraph/README +cat <<EOF > callgraph/README This directory holds output from calltool, as run on Tor. For more information about each of these files, see the NOTES and README files in the calltool distribution.

1 0

[tor/master] Add changes file
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 5a3cb495ce5bf010440fc0288c1ca00fff6ec8e5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 29 11:41:36 2018 +0200 Add changes file --- changes/ticket28011 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket28011 b/changes/ticket28011 new file mode 100644 index 000000000..5efc3c917 --- /dev/null +++ b/changes/ticket28011 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Fix shellcheck warnings in run_calltool.sh. Resolves + ticket 28011.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/448'
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit d671e3f513cb62ca2e649d3c162d0874436eacf2 Merge: 3d8fcbcba 4af27e016 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:09:45 2018 -0400 Merge remote-tracking branch 'tor-github/pr/448' changes/ticket28010 | 3 +++ scripts/codegen/run_trunnel.sh | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/master] Silence shellcheck SC2086 in run_trunnel.sh
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 635312fc2a8fe96aa282ed242279629f814b9333 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 29 10:45:14 2018 +0200 Silence shellcheck SC2086 in run_trunnel.sh --- scripts/codegen/run_trunnel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/codegen/run_trunnel.sh b/scripts/codegen/run_trunnel.sh index 428804342..9df402cf5 100755 --- a/scripts/codegen/run_trunnel.sh +++ b/scripts/codegen/run_trunnel.sh @@ -10,7 +10,7 @@ OPTIONS="--require-version=1.5.1" # Get all .trunnel files recursively from that directory so we can support # multiple sub-directories. for file in `find ./src/trunnel/ -name '*.trunnel'`; do - python -m trunnel ${OPTIONS} $file + python -m trunnel ${OPTIONS} "$file" done python -m trunnel ${OPTIONS} --write-c-files --target-dir=./src/ext/trunnel/

1 0

[tor/master] Add changes file
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 4af27e016814f4817174ed87e7b660d65c6eaf9c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 29 11:05:55 2018 +0200 Add changes file --- changes/ticket28010 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket28010 b/changes/ticket28010 new file mode 100644 index 000000000..4fca17d02 --- /dev/null +++ b/changes/ticket28010 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Fix shellcheck warnings in run_trunnel.sh. Resolves issue + 28010.

1 0

[tor/master] run_trunnel.sh: Use 'find -exec' instead of a 'for' loop
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit a0dd6bfdb03f53a52778e65161b9f3c68234bb82 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 29 10:54:31 2018 +0200 run_trunnel.sh: Use 'find -exec' instead of a 'for' loop This fixes shellcheck warnings SC2044 and SC2006. --- scripts/codegen/run_trunnel.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/codegen/run_trunnel.sh b/scripts/codegen/run_trunnel.sh index 9df402cf5..645b3c215 100755 --- a/scripts/codegen/run_trunnel.sh +++ b/scripts/codegen/run_trunnel.sh @@ -9,9 +9,7 @@ OPTIONS="--require-version=1.5.1" # Get all .trunnel files recursively from that directory so we can support # multiple sub-directories. -for file in `find ./src/trunnel/ -name '*.trunnel'`; do - python -m trunnel ${OPTIONS} "$file" -done +find ./src/trunnel/ -name '*.trunnel' -exec python -m trunnel ${OPTIONS} {} \; python -m trunnel ${OPTIONS} --write-c-files --target-dir=./src/ext/trunnel/

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 336f1fad325d3af022b348e55a8ba33aa770f987 Merge: 4ac3ccf28 5acf6f871 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:02:02 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0