commit 2ddbaf9cdc3c850a56ef1f3bf6977c903e24bb39 Merge: 6f47734ea 75b95e1c8 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 18 08:31:14 2018 -0400 Merge branch 'maint-0.3.3' into maint-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(-)