commit 8d6b1da2e6729c0cf8331e663bdfeee5d5660237
Merge: 961d2ad59 b503df277
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Apr 3 15:29:29 2018 -0400
Merge remote-tracking branch 'isis-github/bug24031_r5_squashed_033' into
maint-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(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
