[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit 0256702362b76345401156fa5258b686b53fe28e
Merge: 20f8fead9 a5d4ce2b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 13:35:33 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 src/or/protover_rust.c   | 17 ++++++++++++++++-
 src/rust/protover/ffi.rs | 26 ++++++++++++++++++++++++++
 src/test/test_protover.c |  2 ++
 3 files changed, 44 insertions(+), 1 deletion(-)