commit bedc0b0b8f66b73a1052dddfdd1fb0c798bff48a
Merge: 042aed3f1 ac721bd3b
Author: Nick Mathewson <[email protected]>
Date: Fri Aug 17 09:29:46 2018 -0400
Merge branch 'maint-0.3.4'
changes/bug27164 | 4 ++++
src/rust/protover/protoset.rs | 14 +++++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --cc src/rust/protover/protoset.rs
index 5cea03983,61b21ede9..a670f796b
--- a/src/rust/protover/protoset.rs
+++ b/src/rust/protover/protoset.rs
@@@ -349,12 -348,12 +349,12 @@@ impl FromStr for ProtoSet
if p.is_empty() {
continue;
} else if p.contains('-') {
- let mut pair = p.split('-');
+ let mut pair = p.splitn(2, '-');
- let low = pair.next().ok_or(ProtoverError::Unparseable)?;
+ let low = pair.next().ok_or(ProtoverError::Unparseable)?;
let high = pair.next().ok_or(ProtoverError::Unparseable)?;
- let lo: Version =
low.parse().or(Err(ProtoverError::Unparseable))?;
+ let lo: Version =
low.parse().or(Err(ProtoverError::Unparseable))?;
let hi: Version =
high.parse().or(Err(ProtoverError::Unparseable))?;
if lo == u32::MAX || hi == u32::MAX {
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
