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

[tor/maint-0.4.3] Merge branch 'tor-github/pr/1912' into maint-0.3.5
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit 6a43aadecc5ab8564e71da2f00483eb63df13ae0 Merge: c1add51bc f49f1d6fb Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jun 12 12:55:17 2020 -0400 Merge branch 'tor-github/pr/1912' into maint-0.3.5 .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[tor/maint-0.4.4] Revert "Travis: temporarily fix stem version to d1174a83c2dcb7b8"
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit f49f1d6fb28d338e0e371ee915a72b85251d239d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 3 14:48:05 2020 -0400 Revert "Travis: temporarily fix stem version to d1174a83c2dcb7b8" This reverts commit e63bfca5f2d98788d11b9a0a82bf67277a228c71, now that Stem has been upgraded to fix the underlying issue. --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 852bebfa0..8bc9898f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,10 +191,7 @@ 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. - ## 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 + - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; 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/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit 75734f48aabb955ed39c42dfd37849a7fa3df423 Merge: 52edea121 272c17113 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jun 12 12:55:41 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit 272c171136f4ed7660ef409f75ce7bac29a004f3 Merge: 754d4e9a1 0f218a05a Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jun 12 12:55:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit 0f218a05a6d8271639a81ec2667f86ef1aa38e66 Merge: 193082895 6a43aadec Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jun 12 12:55:41 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[tor/master] Revert "Travis: temporarily fix stem version to d1174a83c2dcb7b8"
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit f49f1d6fb28d338e0e371ee915a72b85251d239d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 3 14:48:05 2020 -0400 Revert "Travis: temporarily fix stem version to d1174a83c2dcb7b8" This reverts commit e63bfca5f2d98788d11b9a0a82bf67277a228c71, now that Stem has been upgraded to fix the underlying issue. --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 852bebfa0..8bc9898f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,10 +191,7 @@ 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. - ## 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 + - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; 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/maint-0.4.4] Merge branch 'tor-github/pr/1912' into maint-0.3.5
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit 6a43aadecc5ab8564e71da2f00483eb63df13ae0 Merge: c1add51bc f49f1d6fb Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jun 12 12:55:17 2020 -0400 Merge branch 'tor-github/pr/1912' into maint-0.3.5 .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit 0f218a05a6d8271639a81ec2667f86ef1aa38e66 Merge: 193082895 6a43aadec Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jun 12 12:55:41 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'ticket34220_035' into ticket34220_041
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit 82d8304efa92cb55647eb0c6b87b90b9eaf103e0 Merge: 768ffb8f4 f49f1d6fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 3 14:49:03 2020 -0400 Merge branch 'ticket34220_035' into ticket34220_041 .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/1913'
by dgoulet＠torproject.org 12 Jun '20

12 Jun '20

commit 53faca10ad122b71a1b37819726fb60ae3cfb6d6 Merge: 3cb77a9cc c3f589c4d Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jun 12 12:55:34 2020 -0400 Merge branch 'tor-github/pr/1913' .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0