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

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

19 Mar '20

commit 6c2b153db0a82b1f8afb10d0a9f58f3daddc28a8 Merge: 1e9e3e3ea 259fad587 Author: teor <teor(a)torproject.org> Date: Thu Mar 19 17:01:58 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33623 | 2 ++ doc/tor.1.txt | 2 +- src/core/or/sendme.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.3] sendme: Emit version 1 by default
by teor＠torproject.org 19 Mar '20

19 Mar '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.3] Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 259fad5877ae4aefea7996eac4cac436d28e2ee6 Merge: 85414e1c1 ee3e98789 Author: teor <teor(a)torproject.org> Date: Thu Mar 19 16:56:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] doc: Fix a man page typo
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 85414e1c18b09755d4371c30726ecbef562e7412 Author: teor <teor(a)torproject.org> Date: Thu Mar 19 09:24:15 2020 +1000 doc: Fix a man page typo Obviously correct changes to already-reviewed code. --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8f5b43ca5..7abb22c07 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2665,7 +2665,7 @@ types of statistics that Tor relays collect and publish: its extra-info documents that it uploads to the directory authorities. Disabling this option also removes bandwidth usage statistics, and GeoIPFile and GeoIPv6File hashes from the extra-info file. Bridge - ServerTransportPlugin lines are always includes in the extra-info file, + ServerTransportPlugin lines are always included in the extra-info file, because they are required by BridgeDB. (Default: 1)

1 0

[tor/maint-0.4.3] sendme: Emit version 1 by default
by teor＠torproject.org 19 Mar '20

19 Mar '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/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 259fad5877ae4aefea7996eac4cac436d28e2ee6 Merge: 85414e1c1 ee3e98789 Author: teor <teor(a)torproject.org> Date: Thu Mar 19 16:56:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] sendme: Emit version 1 by default
by teor＠torproject.org 19 Mar '20

19 Mar '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/master] Merge branch 'maint-0.4.3'
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit fe5ecaa270b037e76226bd7acda10a14611eef93 Merge: 78b2984ac 259fad587 Author: teor <teor(a)torproject.org> Date: Thu Mar 19 17:02:02 2020 +1000 Merge branch 'maint-0.4.3' changes/ticket33623 | 2 ++ doc/tor.1.txt | 2 +- src/core/or/sendme.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 259fad5877ae4aefea7996eac4cac436d28e2ee6 Merge: 85414e1c1 ee3e98789 Author: teor <teor(a)torproject.org> Date: Thu Mar 19 16:56:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3 changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] doc: Fix a man page typo
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 85414e1c18b09755d4371c30726ecbef562e7412 Author: teor <teor(a)torproject.org> Date: Thu Mar 19 09:24:15 2020 +1000 doc: Fix a man page typo Obviously correct changes to already-reviewed code. --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8f5b43ca5..7abb22c07 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2665,7 +2665,7 @@ types of statistics that Tor relays collect and publish: its extra-info documents that it uploads to the directory authorities. Disabling this option also removes bandwidth usage statistics, and GeoIPFile and GeoIPv6File hashes from the extra-info file. Bridge - ServerTransportPlugin lines are always includes in the extra-info file, + ServerTransportPlugin lines are always included in the extra-info file, because they are required by BridgeDB. (Default: 1)

1 0