commit 52191064acbddabf979c5f3b3f0813c105ce82f3 Merge: 4199c8b2d 2ddbaf9cd Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 18 08:33:13 2018 -0400

Merge branch 'maint-0.3.4'

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