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

[tor/master] Merge branch 'tor-github/pr/718'
by dgoulet＠torproject.org 01 Mar '19

01 Mar '19

commit 13e93bdfd5a3bc8349723a0e3a9e05f2dd300f99 Merge: cb0d40304 64f594499 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Mar 1 09:36:23 2019 -0500 Merge branch 'tor-github/pr/718' changes/ticket29542 | 7 +++++++ src/app/main/main.c | 2 +- src/core/mainloop/cpuworker.c | 7 ++----- src/core/or/relay.c | 14 ++------------ src/core/or/relay.h | 3 --- src/lib/crypt_ops/crypto_rand.h | 9 +++++++++ src/lib/evloop/workqueue.c | 10 +--------- 7 files changed, 22 insertions(+), 30 deletions(-)

1 0

[tor/master] Document crypto_fast_rng_one_in_n.
by dgoulet＠torproject.org 01 Mar '19

01 Mar '19

commit 64f594499a3e8893a6097fa5db7d47962f83d2f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 08:20:54 2019 -0500 Document crypto_fast_rng_one_in_n. --- src/lib/crypt_ops/crypto_rand.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/crypt_ops/crypto_rand.h b/src/lib/crypt_ops/crypto_rand.h index bb424fd69..6f09aedf6 100644 --- a/src/lib/crypt_ops/crypto_rand.h +++ b/src/lib/crypt_ops/crypto_rand.h @@ -68,6 +68,12 @@ unsigned crypto_fast_rng_get_uint(crypto_fast_rng_t *rng, unsigned limit); uint64_t crypto_fast_rng_get_uint64(crypto_fast_rng_t *rng, uint64_t limit); double crypto_fast_rng_get_double(crypto_fast_rng_t *rng); +/** + * Using the fast_rng rng, yield true with probability + * 1/n. Otherwise yield false. + * + * n must not be zero. + **/ #define crypto_fast_rng_one_in_n(rng, n) \ (0 == (crypto_fast_rng_get_uint((rng), (n))))

1 0

[tor/master] Let's not double-quote EXTRA_CARGO_OPTIONS after all
by nickm＠torproject.org 01 Mar '19

01 Mar '19

commit ad48aab0565e8498fd68428fb2cfaa46b39ffc01 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Feb 13 15:04:12 2019 +0200 Let's not double-quote EXTRA_CARGO_OPTIONS after all --- src/test/test_rust.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index da2bd32d2..804d2ada3 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -14,12 +14,13 @@ rustc_host=$(rustc -vV | grep host | sed 's/host: //') for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then + # shellcheck disable=SC2086 cd "${abs_top_builddir:-../../..}/src/rust" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ "${CARGO:-cargo}" test "${CARGO_ONLINE-'--frozen'}" \ --features "test_linking_hack" \ --target "$rustc_host" \ - "${EXTRA_CARGO_OPTIONS}" \ + ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi done

1 0

[tor/master] Fix shellcheck warnings in test_rust.sh
by nickm＠torproject.org 01 Mar '19

01 Mar '19

commit 10455aeff228042ee769205e43788d0e81cde910 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Feb 1 20:53:40 2019 +0200 Fix shellcheck warnings in test_rust.sh --- changes/ticket29064 | 2 ++ src/test/test_rust.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/ticket29064 b/changes/ticket29064 new file mode 100644 index 000000000..616b8aa77 --- /dev/null +++ b/changes/ticket29064 @@ -0,0 +1,2 @@ + o Code simplification and refactoring (shell scripts): + - Fix shellcheck warning in test_rust.sh. Fixes issue 29064. diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 00b3e88d3..da2bd32d2 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -16,10 +16,10 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then cd "${abs_top_builddir:-../../..}/src/rust" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ + "${CARGO:-cargo}" test "${CARGO_ONLINE-'--frozen'}" \ --features "test_linking_hack" \ - --target $rustc_host \ - ${EXTRA_CARGO_OPTIONS} \ + --target "$rustc_host" \ + "${EXTRA_CARGO_OPTIONS}" \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi done

1 0

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

01 Mar '19

commit cb0d40304968735db5e85fc81e451a149bf05cc0 Merge: 2d5c6cddc ad48aab05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 08:22:43 2019 -0500 Merge remote-tracking branch 'tor-github/pr/677' changes/ticket29064 | 2 ++ src/test/test_rust.sh | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Add missing parenthesis
by gk＠torproject.org 01 Mar '19

01 Mar '19

commit 95f303b383fabb0904545a2c5b8150476270e2d0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 1 07:05:02 2019 +0000 Add missing parenthesis --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index aa0a34f..f3d3c27 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -113,7 +113,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END %] -eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %] +eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) if [ -z $MOZ_BUILD_DATE ] then echo "MOZ_BUILD_DATE is not set"

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 7786198eef31b9c608c3e13ae143cd430319af50 Merge: c1ab53847 33a80921a Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:15:00 2019 +1000 Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9 changes/bug24903 | 5 +++++ src/or/control.c | 3 +++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 1c248fa27d978a3a20f29ea76cc23c4c4604d1a0 Merge: de0969ef7 f56645917 Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:16:59 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 1c248fa27d978a3a20f29ea76cc23c4c4604d1a0 Merge: de0969ef7 f56645917 Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:16:59 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
by teor＠torproject.org 01 Mar '19

01 Mar '19

commit 7786198eef31b9c608c3e13ae143cd430319af50 Merge: c1ab53847 33a80921a Author: teor <teor(a)torproject.org> Date: Fri Mar 1 14:15:00 2019 +1000 Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9 changes/bug24903 | 5 +++++ src/or/control.c | 3 +++ 2 files changed, 8 insertions(+)

1 0