commit 84e3ada71bb3339ebde27734f0924b0c39ddab99 Merge: bb012d794 bf9dc697f Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 14 09:25:31 2018 -0400

Merge remote-tracking branch 'onionk/rust-protokeyword1-035'

changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 4 ++++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-)