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

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

30 Jun '20

commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:16:16 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit bb5745d6568ffcaebbe0c69d8e6865ba5eb163ca Merge: 572cf774b fb46d1bb3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:16:16 2020 +0000 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

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

30 Jun '20

commit 8f2571b2339cb1633ff5d84e45d4253195c331c3 Merge: 5e1c0c7db bb5745d65 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:16:16 2020 +0000 Merge branch 'maint-0.4.4'

1 0

[tor/release-0.4.2] sendme: Emit version 1 by default
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit ee3e987898a1e656950aabf8bf0a99aed1450a98 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 17 10:14:57 2020 -0400 sendme: Emit version 1 by default Closes #33623 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket33623 b/changes/ticket33623 new file mode 100644 index 000000000..528af3ca0 --- /dev/null +++ b/changes/ticket33623 @@ -0,0 +1,2 @@ + o Minor feature (sendme, flow control): + - Default on sending SENDME version 1 cells. Closes ticket 33623. diff --git a/src/core/or/sendme.h b/src/core/or/sendme.h index 20477103f..9d757ee43 100644 --- a/src/core/or/sendme.h +++ b/src/core/or/sendme.h @@ -48,7 +48,7 @@ void sendme_record_sending_cell_digest(circuit_t *circ, crypt_path_t *cpath); #define SENDME_MAX_SUPPORTED_VERSION 1 /* The cell version constants for when emitting a cell. */ -#define SENDME_EMIT_MIN_VERSION_DEFAULT 0 +#define SENDME_EMIT_MIN_VERSION_DEFAULT 1 #define SENDME_EMIT_MIN_VERSION_MIN 0 #define SENDME_EMIT_MIN_VERSION_MAX UINT8_MAX

1 0

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

30 Jun '20

commit 511e1cfde4152b3ad40cbc4ec6880f9035c5a3b9 Merge: 1b106cded 881f50a9a Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:16:16 2020 +0000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'tor-github/pr/1806' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:15:57 2020 +0000 Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] Merge branch 'tor-github/pr/1806' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:15:57 2020 +0000 Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

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

30 Jun '20

commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:16:16 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.4.4] Merge branch 'tor-github/pr/1806' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:15:57 2020 +0000 Merge branch 'tor-github/pr/1806' into maint-0.4.2 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 0a3093533357d800389bf2d610bce3d3603ed544 Merge: 0c714b2c5 fb46d1bb3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:16:16 2020 +0000 Merge branch 'maint-0.4.3' into release-0.4.3

1 0