commit 34cd1fc52396175a98837f856fc59a0c362cb8a2 Merge: 63c5e09a4 5e74db95c Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 16 21:33:38 2018 -0400 Merge remote-tracking branch 'tor-github/pr/406' src/rust/external/external.rs | 3 +-- src/rust/protover/protoset.rs | 2 +- src/rust/protover/protover.rs | 50 ++++++++++++++++++++++--------------------- 3 files changed, 28 insertions(+), 27 deletions(-)