commit 574d59c6405e6c8a4baee77e90afac8c9e89a3db Merge: 3ddfd5ff2 7c26f88fd Author: cypherpunks cypherpunks@torproject.org Date: Fri Sep 14 02:26:31 2018 +0000

Merge branch 'rust-protokeyword1' into rust-protokeyword1-034

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