[tor-commits] [tor/master] Merge remote-tracking branch 'isis-github/bug24031_r5_squashed'

[nickm at torproject.org]

commit 29b3b485b9722ceead4b931af521b999d3c2aeb3
Merge: c2c616eb1 5a8cdec3f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 3 15:33:50 2018 -0400

    Merge remote-tracking branch 'isis-github/bug24031_r5_squashed'

 changes/bug24031                    |   13 +
 src/or/protover.c                   |   77 ++-
 src/rust/protover/errors.rs         |   43 ++
 src/rust/protover/ffi.rs            |   96 ++-
 src/rust/protover/lib.rs            |    7 +-
 src/rust/protover/protoset.rs       |  634 +++++++++++++++++
 src/rust/protover/protover.rs       | 1289 ++++++++++++++++-------------------
 src/rust/protover/tests/protover.rs |  421 +++++++-----
 src/test/test_protover.c            |   44 +-
 9 files changed, 1684 insertions(+), 940 deletions(-)