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

[nickm at torproject.org]

commit ea1de844323e9eecdce833e24bcf7fda130f3b3e
Merge: 5529449bb a999cb43d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 5 13:00:05 2019 -0500

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/ticket29631      |  4 ++++
 src/core/or/protover.h   | 22 +++++++++++-----------
 src/rust/protover/ffi.rs |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)