commit 75b95e1c8e28e1136b5bc98fd89321e478f4b836 Merge: a546e0760 5c47f725b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 18 08:31:08 2018 -0400 Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3 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(-)