commit 744399ea78de9be5277c99236ee33fca74ad6039 Merge: f6a230ec9 5af03c1ef Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 15 20:00:33 2018 -0500

Merge branch 'protover_rust_compat_v3'

src/rust/protover/protover.rs | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-)