May 2020 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 14 May '20

14 May '20

commit 2c2c349bdfbb2ac6eb9624607a2153deebdb7426 Merge: 789de7c35 e63bfca5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 14 May '20

14 May '20

commit e26b3778ded828ae8499219f0862af1eb70c862a Merge: 792dbff8f 72312cdbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Travis: temporarily fix stem version to d1174a83c2dcb7b8
by nickm＠torproject.org 14 May '20

14 May '20

commit e63bfca5f2d98788d11b9a0a82bf67277a228c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 13 08:53:02 2020 -0400 Travis: temporarily fix stem version to d1174a83c2dcb7b8 This is a workaround for https://github.com/torproject/stem/issues/63 --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8bc9898f8..852bebfa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,7 +191,10 @@ install: ## If we're running chutney, install it. - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi ## If we're running stem, install it. - - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; fi + ## XXXX We are temporarily fixing the version at d1174a83 to work around + ## https://github.com/torproject/stem/issues/63 . + ## - if [[ "$TEST_STEM" != "" ]]; then git clone --no-tags --depth 1 https://github.com/torproject/stem.git; export STEM_SOURCE_DIR=`pwd`/stem; fi + - if [[ "$TEST_STEM" != "" ]]; then git clone https://github.com/torproject/stem.git && ( cd ./stem && git checkout d1174a83c2dcb7b855d8fc986be3ab8f8d88d68c) ; export STEM_SOURCE_DIR=`pwd`/stem; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 14 May '20

14 May '20

commit 371d5ece5b3243538637ceef2d5e91b944d12420 Merge: 1557e73c8 ee6409ab6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.3' .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Travis: temporarily fix stem version to d1174a83c2dcb7b8
by nickm＠torproject.org 14 May '20

14 May '20

commit e63bfca5f2d98788d11b9a0a82bf67277a228c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 13 08:53:02 2020 -0400 Travis: temporarily fix stem version to d1174a83c2dcb7b8 This is a workaround for https://github.com/torproject/stem/issues/63 --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8bc9898f8..852bebfa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,7 +191,10 @@ install: ## If we're running chutney, install it. - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi ## If we're running stem, install it. - - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; fi + ## XXXX We are temporarily fixing the version at d1174a83 to work around + ## https://github.com/torproject/stem/issues/63 . + ## - if [[ "$TEST_STEM" != "" ]]; then git clone --no-tags --depth 1 https://github.com/torproject/stem.git; export STEM_SOURCE_DIR=`pwd`/stem; fi + - if [[ "$TEST_STEM" != "" ]]; then git clone https://github.com/torproject/stem.git && ( cd ./stem && git checkout d1174a83c2dcb7b855d8fc986be3ab8f8d88d68c) ; export STEM_SOURCE_DIR=`pwd`/stem; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 14 May '20

14 May '20

commit 72312cdbb166e2c0c9d4b6dba049f43c2d35ecdc Merge: d41f1cd3e e63bfca5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 14 May '20

14 May '20

commit ee6409ab63b1810cb152b09b7b490808ce6d4e6b Merge: b444096be b8bff426f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 14 May '20

14 May '20

commit b8bff426f311a5b6cf345e985936b3efd693bfce Merge: b16c1e4cf 72312cdbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 14 May '20

14 May '20

commit ee6409ab63b1810cb152b09b7b490808ce6d4e6b Merge: b444096be b8bff426f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 14 May '20

14 May '20

commit 72312cdbb166e2c0c9d4b6dba049f43c2d35ecdc Merge: d41f1cd3e e63bfca5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0