commit 753840a8a7c946dbf2188cb4f8b03b8ff7cfbe61 Merge: 5bdc18b2d 7ccb1c5a8 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 3 19:03:38 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug24031 | 13 + src/or/protover.c | 77 ++- src/rust/protover/errors.rs | 43 ++ src/rust/protover/ffi.rs | 94 ++- src/rust/protover/lib.rs | 4 + src/rust/protover/protoset.rs | 634 ++++++++++++++++++ src/rust/protover/protover.rs | 1265 ++++++++++++++++------------------- src/rust/protover/tests/protover.rs | 421 +++++++----- src/test/test_protover.c | 44 +- 9 files changed, 1690 insertions(+), 905 deletions(-)