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

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit 71e72ce9caa5e7ed07f475a8ed1b40fce46c86d5 Merge: 958f6eb5c 2d34d4d1a Author: teor <teor(a)torproject.org> Date: Thu Apr 9 19:43:24 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.3] remove practracker from check-local (0.4.2 and 0.4.3 only)
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 03593df16..eaffbe41a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -245,7 +245,7 @@ test: all shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes check-best-practices shellcheck +check-local: check-spaces check-changes check-includes shellcheck need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit c502ce0762e1680503f6e6dc64c82852ccd19738 Merge: 456337a8d 1ae0839ef Author: teor <teor(a)torproject.org> Date: Thu Apr 9 19:43:28 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 Makefile.am | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit 1ae0839ef24d303f77cec165df5223a66131567c Merge: f6efb3a18 2d34d4d1a Author: teor <teor(a)torproject.org> Date: Thu Apr 9 19:41:19 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines in 0.4.3.) Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --cc Makefile.am index ac61a990f,eaffbe41a..8b55bf0e3 --- a/Makefile.am +++ b/Makefile.am @@@ -267,13 -245,7 +267,12 @@@ test: al shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes shellcheck +check-local: \ + check-spaces \ + check-changes \ + check-includes \ - check-best-practices \ + shellcheck \ + check-cocci need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit 1ae0839ef24d303f77cec165df5223a66131567c Merge: f6efb3a18 2d34d4d1a Author: teor <teor(a)torproject.org> Date: Thu Apr 9 19:41:19 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines in 0.4.3.) Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --cc Makefile.am index ac61a990f,eaffbe41a..8b55bf0e3 --- a/Makefile.am +++ b/Makefile.am @@@ -267,13 -245,7 +267,12 @@@ test: al shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes shellcheck +check-local: \ + check-spaces \ + check-changes \ + check-includes \ - check-best-practices \ + shellcheck \ + check-cocci need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \

1 0

[tor/maint-0.4.3] remove practracker from check-local (0.4.2 and 0.4.3 only)
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 03593df16..eaffbe41a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -245,7 +245,7 @@ test: all shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes check-best-practices shellcheck +check-local: check-spaces check-changes check-includes shellcheck need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \

1 0

[tor/maint-0.4.2] remove practracker from check-local (0.4.2 and 0.4.3 only)
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 03593df16..eaffbe41a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -245,7 +245,7 @@ test: all shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes check-best-practices shellcheck +check-local: check-spaces check-changes check-includes shellcheck need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit 1ae0839ef24d303f77cec165df5223a66131567c Merge: f6efb3a18 2d34d4d1a Author: teor <teor(a)torproject.org> Date: Thu Apr 9 19:41:19 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines in 0.4.3.) Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --cc Makefile.am index ac61a990f,eaffbe41a..8b55bf0e3 --- a/Makefile.am +++ b/Makefile.am @@@ -267,13 -245,7 +267,12 @@@ test: al shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes shellcheck +check-local: \ + check-spaces \ + check-changes \ + check-includes \ - check-best-practices \ + shellcheck \ + check-cocci need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \

1 0

[tor/master] remove practracker from check-local (0.4.2 and 0.4.3 only)
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 03593df16..eaffbe41a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -245,7 +245,7 @@ test: all shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes check-best-practices shellcheck +check-local: check-spaces check-changes check-includes shellcheck need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \

1 0

[tor/master] Merge branch 'maint-0.4.3'
by teor＠torproject.org 09 Apr '20

09 Apr '20

commit f431b78465ca8f1339598aa81b85300528c29de3 Merge: 4e3a17fac 1ae0839ef Author: teor <teor(a)torproject.org> Date: Thu Apr 9 19:42:36 2020 +1000 Merge branch 'maint-0.4.3' "ours" merge, because we only want to remove check-best-practices from check-local in 0.4.2 and 0.4.3.

1 0