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

[tor/maint-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 00fe214729b935adc522883fa84b399429fefa74 Merge: 0c90fc37e 0ff3e8f4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:00 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" merge, since the exceptions.txt file is already fixed in this branch.

1 0

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

11 Feb '20

commit de31c4757b6a58a3b5255298918c6d28e100b506 Merge: 409e1ca3d 00fe21472 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:41 2020 -0500 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

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

11 Feb '20

commit de31c4757b6a58a3b5255298918c6d28e100b506 Merge: 409e1ca3d 00fe21472 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:41 2020 -0500 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.4.2] Remove a redundant practracker exception line in maint-0.4.1
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:52:23 2020 -0500 Remove a redundant practracker exception line in maint-0.4.1 This will our "git push" hook not complain about pushing from maint-0.4.1. --- scripts/maint/practracker/exceptions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 726dc9c3e..eaa98f0f2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -88,7 +88,6 @@ problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 problem file-size /src/core/or/circuitpadding.c 3040 -problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 104 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112

1 0

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

11 Feb '20

commit 80c5c874cc3cf1738bf3c84494a0996b2d4fe25e Merge: 384a771fc de31c4757 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:41 2020 -0500 Merge branch 'maint-0.4.3'

1 0

[tor/release-0.4.1] Remove a redundant practracker exception line in maint-0.4.1
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:52:23 2020 -0500 Remove a redundant practracker exception line in maint-0.4.1 This will our "git push" hook not complain about pushing from maint-0.4.1. --- scripts/maint/practracker/exceptions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 726dc9c3e..eaa98f0f2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -88,7 +88,6 @@ problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 problem file-size /src/core/or/circuitpadding.c 3040 -problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 104 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112

1 0

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

11 Feb '20

commit f9e73a923e0734cbffbc20cea75cf59fe059f53e Merge: d2cbefbb8 0ff3e8f4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:41 2020 -0500 Merge branch 'maint-0.4.1' into release-0.4.1 scripts/maint/practracker/exceptions.txt | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 00fe214729b935adc522883fa84b399429fefa74 Merge: 0c90fc37e 0ff3e8f4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:00 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" merge, since the exceptions.txt file is already fixed in this branch.

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit d006cb25bd86f1acfbd8ac5626723b53a16ef43a Merge: f8ff2f12d 00fe21472 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:41 2020 -0500 Merge branch 'maint-0.4.2' into release-0.4.2

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit de31c4757b6a58a3b5255298918c6d28e100b506 Merge: 409e1ca3d 00fe21472 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:41 2020 -0500 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0