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

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 347b38d6d9dc73f0d14ff60ee8729550cea9a952 Merge: 04007557f e813116d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Switch Travis to stable rust
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6450d270..0c0188410 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,8 +122,8 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || brew upgrade xz; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt || brew upgrade libscrypt; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd || brew upgrade zstd; }; fi - ## Install the nightly channels of rustc and cargo and setup our toolchain environment - - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi ## Get some info about rustc and cargo - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi diff --git a/changes/ticket25714 b/changes/ticket25714 new file mode 100644 index 000000000..63823fc6c --- /dev/null +++ b/changes/ticket25714 @@ -0,0 +1,4 @@ + o Minor feature (continuous integration): + - Update the Travis CI configuration to use the stable Rust + channel, now that we have decided to require that. Closes + ticket 25714.

1 0

[tor/maint-0.3.3] Switch Travis to stable rust
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6450d270..0c0188410 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,8 +122,8 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || brew upgrade xz; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt || brew upgrade libscrypt; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd || brew upgrade zstd; }; fi - ## Install the nightly channels of rustc and cargo and setup our toolchain environment - - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi ## Get some info about rustc and cargo - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi diff --git a/changes/ticket25714 b/changes/ticket25714 new file mode 100644 index 000000000..63823fc6c --- /dev/null +++ b/changes/ticket25714 @@ -0,0 +1,4 @@ + o Minor feature (continuous integration): + - Update the Travis CI configuration to use the stable Rust + channel, now that we have decided to require that. Closes + ticket 25714.

1 0

[tor/maint-0.3.1] Switch Travis to stable rust
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit e813116d3d630d81feb97f39dd65fdf245eecebc Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Apr 4 17:07:39 2018 -0500 Switch Travis to stable rust --- .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6450d270..0c0188410 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,8 +122,8 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || brew upgrade xz; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt || brew upgrade libscrypt; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd || brew upgrade zstd; }; fi - ## Install the nightly channels of rustc and cargo and setup our toolchain environment - - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi ## Get some info about rustc and cargo - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi diff --git a/changes/ticket25714 b/changes/ticket25714 new file mode 100644 index 000000000..63823fc6c --- /dev/null +++ b/changes/ticket25714 @@ -0,0 +1,4 @@ + o Minor feature (continuous integration): + - Update the Travis CI configuration to use the stable Rust + channel, now that we have decided to require that. Closes + ticket 25714.

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

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

05 Apr '18

commit 2dee38fba0193c952500b9d0227ebcff6d5432d6 Merge: 78bf56416 df519e5de Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit ad0bc6e54c906e3c9e44a25d7675954b88775535 Merge: 876b4b168 2dee38fba Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253 ++++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 5391 +++---- 3 files changed, 31480 insertions(+), 13168 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 9b10eb2d7abe703f544aca559d385fc7f2600009 Merge: 0b795ce6d 834eef245 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253 ++++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 5391 +++---- 3 files changed, 31480 insertions(+), 13168 deletions(-)

1 0