diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-10 14:17:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-10 14:17:09 -0500 |
| commit | f3fa22bf1b52dfce65a37e6a84bac8635916e8c2 (patch) | |
| tree | 4570bca37ebdec45b1d3b78b0489b148bb157c46 | |
| parent | 65825018c7aed931324dd427bb1e84544a9b2f47 (diff) | |
| parent | 2b6df3da21803519c262099ab9dd950271f3ce11 (diff) | |
| download | tor-maint-0.4.0.tar.gz tor-maint-0.4.0.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0maint-0.4.0
| -rw-r--r-- | changes/ticket33212 | 4 | ||||
| -rw-r--r-- | src/rust/protover/protover.rs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/ticket33212 b/changes/ticket33212 new file mode 100644 index 0000000000..aeb09e0c67 --- /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 74158d9f6d..a08e835393 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; |