diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-10 14:17:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-10 14:17:10 -0500 |
| commit | d2cbefbb8f26a17742629251023e786f12a6f555 (patch) | |
| tree | ea6572c836e129dd87fb7ec5d2356df5c40ba9f0 | |
| parent | 06df2f51d793ada367a291a9770544b178db2239 (diff) | |
| parent | 71c49f735636d626abaa13222aa14e7c97f73393 (diff) | |
| download | tor-d2cbefbb8f26a17742629251023e786f12a6f555.tar.gz tor-d2cbefbb8f26a17742629251023e786f12a6f555.zip | |
Merge branch 'maint-0.4.1' into release-0.4.1
| -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 7a76fcdd94..0ca960bd69 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; |