commit 700f5bcc43fb959927dd1cae4e2943d115144850 Merge: ac721bd3b 87aacbfbb Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 17 09:38:26 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)