[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3

[nickm at torproject.org]

commit 87aacbfbba2e2fee67de218b721c0bdb9a0ae73a
Merge: cc93f175e 7b7dd9ae1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 09:38:08 2018 -0400

    Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3

 changes/bug27177              |  4 ++++
 src/rust/protover/protoset.rs | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)