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

[nickm at torproject.org]

commit f177ec21424ea50b289acca38ce39b2c8ea401c6
Merge: 2b2634339 569b4e57e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 12:33:54 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/TROVE-2018-005        |  6 +++
 src/or/dirserv.c              |  6 +++
 src/or/protover.c             | 34 ++++++++++++++++
 src/or/protover.h             |  3 +-
 src/rust/protover/ffi.rs      | 14 +++++--
 src/rust/protover/protover.rs | 93 +++++++++++++++++++++++++++++++++++++------
 src/test/test_protover.c      | 25 ++++++++++++
 7 files changed, 164 insertions(+), 17 deletions(-)