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

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 04618371497bd5040d3af3e6fd782c361a7ba3a5 Merge: 1132dc9f7 664d1b436 Author: teor <teor(a)torproject.org> Date: Thu Sep 5 14:47:34 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] test: Change "make test-stem" so it only runs the stem tests that use tor
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 664d1b436651aca81579a06cde8437ae8f15484f Author: teor <teor(a)torproject.org> Date: Thu Aug 29 21:56:16 2019 +1000 test: Change "make test-stem" so it only runs the stem tests that use tor This change makes test-stem faster and more reliable. Use "make test-stem-full" to run all of stem's tests. Closes ticket 31554. --- Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b268180c5..5d18666ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,7 +275,7 @@ need-stem-path: fi test-stem: need-stem-path $(TESTING_TOR_BINARY) - @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --log notice --target RUN_ALL; + @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --test control.controller --test control.base_controller --test process --log notice; test-stem-full: need-stem-path $(TESTING_TOR_BINARY) @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v; diff --git a/changes/ticket31554 b/changes/ticket31554 new file mode 100644 index 000000000..73f4159ff --- /dev/null +++ b/changes/ticket31554 @@ -0,0 +1,4 @@ + o Minor features (stem tests): + - Change "make test-stem" so it only runs the stem tests that use tor. + This change makes test-stem faster and more reliable. + Closes ticket 31554.

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 896a1ac50b6ab182c1e15cc5271d0b24fcb90a31 Merge: 1203e137b 046183714 Author: teor <teor(a)torproject.org> Date: Thu Sep 5 14:47:54 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] test: Change "make test-stem" so it only runs the stem tests that use tor
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 664d1b436651aca81579a06cde8437ae8f15484f Author: teor <teor(a)torproject.org> Date: Thu Aug 29 21:56:16 2019 +1000 test: Change "make test-stem" so it only runs the stem tests that use tor This change makes test-stem faster and more reliable. Use "make test-stem-full" to run all of stem's tests. Closes ticket 31554. --- Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b268180c5..5d18666ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,7 +275,7 @@ need-stem-path: fi test-stem: need-stem-path $(TESTING_TOR_BINARY) - @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --log notice --target RUN_ALL; + @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --test control.controller --test control.base_controller --test process --log notice; test-stem-full: need-stem-path $(TESTING_TOR_BINARY) @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v; diff --git a/changes/ticket31554 b/changes/ticket31554 new file mode 100644 index 000000000..73f4159ff --- /dev/null +++ b/changes/ticket31554 @@ -0,0 +1,4 @@ + o Minor features (stem tests): + - Change "make test-stem" so it only runs the stem tests that use tor. + This change makes test-stem faster and more reliable. + Closes ticket 31554.

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 04618371497bd5040d3af3e6fd782c361a7ba3a5 Merge: 1132dc9f7 664d1b436 Author: teor <teor(a)torproject.org> Date: Thu Sep 5 14:47:34 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 4596ead2fc88e4b1482b0f3bc8ff356daea2337b Merge: 9dd908e71 896a1ac50 Author: teor <teor(a)torproject.org> Date: Thu Sep 5 14:48:02 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

[tor/master] Merge branch 'maint-0.4.1'
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 9a402a654a311dc9b326445d12bc0170887a544a Merge: 2ff6ebc6f 4596ead2f Author: teor <teor(a)torproject.org> Date: Thu Sep 5 14:48:09 2019 +1000 Merge branch 'maint-0.4.1'

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 04618371497bd5040d3af3e6fd782c361a7ba3a5 Merge: 1132dc9f7 664d1b436 Author: teor <teor(a)torproject.org> Date: Thu Sep 5 14:47:34 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit 896a1ac50b6ab182c1e15cc5271d0b24fcb90a31 Merge: 1203e137b 046183714 Author: teor <teor(a)torproject.org> Date: Thu Sep 5 14:47:54 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Bug 30649: Changes file.
by teor＠torproject.org 05 Sep '19

05 Sep '19

commit ec38b662f2bfbaa197f78b75493b4e8734610e26 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 30 15:18:16 2019 -0700 Bug 30649: Changes file. --- changes/bug30649 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug30649 b/changes/bug30649 new file mode 100644 index 000000000..3f5768bcb --- /dev/null +++ b/changes/bug30649 @@ -0,0 +1,4 @@ + o Minor bugfixes (circuit padding): + - On relays, properly check that a padding machine is absent before + logging a warn about it being absent. Fixes bug 30649; + bugfix on 0.4.1.1-alpha.

1 0