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

[webwml/master] debian-selector.js: Bump Tor to 0.3.4.x
by hiro＠torproject.org 22 Aug '18

22 Aug '18

commit e71dd8f10140cff8a62e22b284d063ef07e00df6 Author: Traumschule <traumschule(a)riseup.net> Date: Sat Aug 11 15:54:16 2018 +0200 debian-selector.js: Bump Tor to 0.3.4.x --- docs/debian-selector.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/debian-selector.js b/docs/debian-selector.js index d0d31505..c8db5c2a 100644 --- a/docs/debian-selector.js +++ b/docs/debian-selector.js @@ -13,7 +13,7 @@ var software = { 'artful': [ 'artful'], 'bionic': [ 'bionic'], }, - 'experimental-0.3.3.x': { + 'experimental-0.3.4.x': { 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'buster': [ 'buster' ], @@ -45,7 +45,7 @@ var software = { 'artful': [ 'artful'], 'bionic': [ 'bionic'], }, - 'experimental-0.3.3.x': { + 'experimental-0.3.4.x': { 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'buster': [ 'buster' ],

1 0

[tor/master] Remove duplicate include in src/test/test_address.c
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 3bf4493cb9d400cf5cda864339de98dd3bf832e1 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Aug 21 20:01:48 2018 -0400 Remove duplicate include in src/test/test_address.c --- src/test/test_address.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 7e2ccc1b5..e99220f83 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -26,7 +26,6 @@ #include "core/or/or.h" #include "feature/nodelist/nodelist.h" #include "lib/net/address.h" -#include "lib/net/address.h" #include "test/test.h" #include "test/log_test_helpers.h"

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/287'
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit e619fd02ef9a9926731244b2b19024a04f93fd5a Merge: 05cd3224a 3bf4493cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:08:55 2018 -0400 Merge remote-tracking branch 'tor-github/pr/287' src/test/test_address.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit f0633bc49164a10ca163aa94139222682af376f7 Merge: 245025a3d 6463cdea5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:03:56 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3 .travis.yml | 262 +++++++++++++++++++++++++------------------ changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh | 6 +- 15 files changed, 191 insertions(+), 118 deletions(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit aac1e17f22acfc7338ec5290db55fbbfd8ddfdbf Merge: f68aab83b c28da0d8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:04:03 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4 .travis.yml | 276 ++++++++++++++++++++++++------------------- changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh | 7 +- 15 files changed, 195 insertions(+), 129 deletions(-)

1 0

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

22 Aug '18

commit 9d64304bec7c6159bcd66f614e91c1a25df2e7e3 Merge: c4e96a3de 81e529d23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .travis.yml | 276 ++++++++++++++++++++++++------------------- changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh | 7 +- 15 files changed, 195 insertions(+), 129 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 81e529d236f41607b133c5562e2d5887fcfd5b8a Merge: aac1e17f2 3cfceeb45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 Merge: f0633bc49 a5bbe3f1d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3

1 0

[tor/release-0.3.3] Stop setting $CARGO_HOME in src/rust/tor_rust/include.am
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:47:36 2018 +1000 Stop setting $CARGO_HOME in src/rust/tor_rust/include.am cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha. --- src/rust/tor_rust/include.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index c02324cb7..40511bf9f 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -7,7 +7,6 @@ EXTRA_CARGO_OPTIONS= src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ $(CARGO_ONLINE) \ --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) @@ -15,7 +14,6 @@ src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE distclean-rust: ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ $(CARGO_ONLINE) \ --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )

1 0

[tor/release-0.3.3] Rust: use a consistent working directory in builds and tests
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 229a75a49a440e61c97dca820cf59360470e1560 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:54:26 2018 +1000 Rust: use a consistent working directory in builds and tests cd to ${abs_top_builddir}/src/rust before running cargo in src/test/test_rust.sh. Fixes bug 26497; bugfix on 0.3.3.2-alpha. --- changes/bug26497-cd | 4 ++++ src/test/test_rust.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug26497-cd b/changes/bug26497-cd new file mode 100644 index 000000000..37bf1bc95 --- /dev/null +++ b/changes/bug26497-cd @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - cd to ${abs_top_builddir}/src/rust before running cargo in + src/test/test_rust.sh. This makes the working directory consistent + between builds and tests. Fixes bug 26497; bugfix on 0.3.3.2-alpha. diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 2761b612b..4afc84285 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -7,7 +7,7 @@ export LSAN_OPTIONS=suppressions=${abs_top_srcdir:-../../..}/src/test/rust_supp. for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then - cd "${cargo_toml_dir}" && \ + cd "${abs_top_builddir:-../../..}/src/rust" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \

1 0