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

[nickm at torproject.org]

commit 8d142e2322398a799a9554daf566b6fd856d7dd8
Merge: cce76fbbe b85436c59
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 8 17:16:14 2018 -0500

    Merge remote-tracking branch 'isis/bug25127'

 changes/bug25127              |  7 ++++
 src/rust/protover/ffi.rs      | 65 +++++++++++++++++++++++-----------
 src/rust/protover/lib.rs      |  1 +
 src/rust/protover/protover.rs | 80 ++++++++++++++++++++++-------------------
 src/rust/tor_util/lib.rs      |  2 +-
 src/rust/tor_util/strings.rs  | 82 +++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 179 insertions(+), 58 deletions(-)