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

[tor/release-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 393bbd823ec32f8fb3636391945e6c6663ff1408 Merge: fd1686c7d c1649ab01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:16:01 2020 -0500 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

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

29 Jun '20

commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

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

29 Jun '20

commit ec2bc07f420ea3c76222583f2275941818b99257 Merge: 5668287fe d235e523d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33290 | 4 ++++ src/core/or/circuitmux.c | 8 ++++++-- src/core/or/circuitmux_ewma.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'ticket33290_v2_042' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 ++++ src/core/or/circuitmux.c | 8 ++++++-- src/core/or/circuitmux_ewma.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit feddba6f8b5af92cc7618d09c99b3290d7372174 Merge: b2ce815bd eef77227e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/release-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit fd1686c7d8df8d8159fcaab1c59dfabe154afd88 Merge: ff5220536 fff1054d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 13 09:12:48 2020 -0500 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 changes/ticket33290 | 4 ++++ src/core/or/circuitmux.c | 8 ++++++-- src/core/or/circuitmux_ewma.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-)

1 0

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

29 Jun '20

commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 76e04a83267de91cda21253a268ea131d52ac679 Merge: 1850ac469 feddba6f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4

1 0

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

29 Jun '20

commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 5b47a58d1697462b83299d1ab0b7192e9dae6e35 Merge: def7844c4 b2ce815bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.4'

1 0