From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 17 Aug 2018 13:29:46 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bedc0b0b8f66b73a1052dddfdd1fb0c798bff48a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

bedc0b0b8f66b73a1052dddfdd1fb0c798bff48a
diff --cc src/rust/protover/protoset.rs
index 5cea03983a,61b21ede98..a670f796bf
--- 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 {