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

[tor/master] Merge branch 'bug33212_035' into maint-0.3.5
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 2b6df3da21803519c262099ab9dd950271f3ce11 Merge: 41d52e9cd 99d044d55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:03 2020 -0500 Merge branch 'bug33212_035' into maint-0.3.5 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

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

10 Feb '20

commit d9144700af5602cc267c0d147145c100567fdbb3 Merge: dab0b1c3a 0c90fc37e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:10 2020 -0500 Merge branch 'maint-0.4.2' changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2 Merge: 65825018c 2b6df3da2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:09 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

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

10 Feb '20

commit 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c Merge: c5e610af0 71c49f735 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:10 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Fix a Rust compilation warning; resolve bug 33212.
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 99d044d553c08d3b2900dbca30199083067515b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 13:32:09 2020 -0500 Fix a Rust compilation warning; resolve bug 33212. --- changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket33212 b/changes/ticket33212 new file mode 100644 index 000000000..aeb09e0c6 --- /dev/null +++ b/changes/ticket33212 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust, and creating + problems for our continuous integration. + Fixes bug 33212; bugfix on 0.3.5.1-alpha. diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 2661d811c..06fdf56c6 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str = "0.2.9.3-alpha"; /// before concluding that someone is trying to DoS us /// /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND` -const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16); +const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16; /// The maximum size an `UnknownProtocol`'s name may be. pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;

1 0

[tor/release-0.4.0] Merge branch 'bug33212_035' into maint-0.3.5
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 2b6df3da21803519c262099ab9dd950271f3ce11 Merge: 41d52e9cd 99d044d55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:03 2020 -0500 Merge branch 'bug33212_035' into maint-0.3.5 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

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

10 Feb '20

commit ed2cbbf71680fd2be67eb7b74c44572e58895d72 Merge: d0d2aba9f f3fa22bf1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:09 2020 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

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

10 Feb '20

commit 2b6df3da21803519c262099ab9dd950271f3ce11 Merge: 41d52e9cd 99d044d55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:03 2020 -0500 Merge branch 'bug33212_035' into maint-0.3.5 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

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

10 Feb '20

commit 71c49f735636d626abaa13222aa14e7c97f73393 Merge: 7afb95d3e f3fa22bf1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:10 2020 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'bug33212_035' into maint-0.3.5
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 2b6df3da21803519c262099ab9dd950271f3ce11 Merge: 41d52e9cd 99d044d55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:03 2020 -0500 Merge branch 'bug33212_035' into maint-0.3.5 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0