commit 3384638c6d7dfe18c64066bd9916d46166223478 Merge: c1e020636 2ddbaf9cd Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 18 08:31:14 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27206 | 4 +++ src/rust/protover/protoset.rs | 49 +++++++++++++++++++++++++++---------- src/rust/protover/protover.rs | 4 +-- src/rust/protover/tests/protover.rs | 8 +++--- 4 files changed, 45 insertions(+), 20 deletions(-)