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

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

27 Aug '18

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457 Merge: 33e4e30d0 70a07fa90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542 Merge: 2e54c80ae 0483f7f64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.4' changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] When running make test-network-all, use the mixed+hs-v2 network
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 70a07fa90b3aa908e2878356464dd5c889066a4c Author: teor <teor(a)torproject.org> Date: Mon Aug 27 23:06:04 2018 +1000 When running make test-network-all, use the mixed+hs-v2 network No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha. --- changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 000000000..d98f4afbc --- /dev/null +++ b/changes/bug27345 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When running make test-network-all, use the mixed+hs-v2 network. + (A previous fix to chutney removed v3 onion services from the + mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is + confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 230845a1e..2f6789c58 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor -TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23 +TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2 ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet.

1 0

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

27 Aug '18

commit 4acfc8d4b296807ef3b5e7b2b157a40666f81baa Merge: 66cad7e97 70a07fa90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

27 Aug '18

commit 71f84c93b059ca440ae7e428cb8c34b25c1d2a77 Merge: 583ef6042 64c3c6a79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

27 Aug '18

commit a7a900685db464702b00d706c0688d53d8400f4a Merge: f5fea5934 0483f7f64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] When running make test-network-all, use the mixed+hs-v2 network
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 70a07fa90b3aa908e2878356464dd5c889066a4c Author: teor <teor(a)torproject.org> Date: Mon Aug 27 23:06:04 2018 +1000 When running make test-network-all, use the mixed+hs-v2 network No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha. --- changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 000000000..d98f4afbc --- /dev/null +++ b/changes/bug27345 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When running make test-network-all, use the mixed+hs-v2 network. + (A previous fix to chutney removed v3 onion services from the + mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is + confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 230845a1e..2f6789c58 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor -TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23 +TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2 ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet.

1 0

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

27 Aug '18

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457 Merge: 33e4e30d0 70a07fa90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

27 Aug '18

commit 0483f7f64c80fe18c922415ae6062149a2ebb9f7 Merge: 4c1c818ff 64c3c6a79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] When running make test-network-all, use the mixed+hs-v2 network
by nickm＠torproject.org 27 Aug '18

27 Aug '18

commit 70a07fa90b3aa908e2878356464dd5c889066a4c Author: teor <teor(a)torproject.org> Date: Mon Aug 27 23:06:04 2018 +1000 When running make test-network-all, use the mixed+hs-v2 network No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha. --- changes/bug27345 | 5 +++++ src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug27345 b/changes/bug27345 new file mode 100644 index 000000000..d98f4afbc --- /dev/null +++ b/changes/bug27345 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When running make test-network-all, use the mixed+hs-v2 network. + (A previous fix to chutney removed v3 onion services from the + mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is + confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 230845a1e..2f6789c58 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor -TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23 +TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2 ### This is a lovely feature, but it requires automake >= 1.12, and Tor ### doesn't require that yet.

1 0