[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[nickm at torproject.org]

commit f1890707ccfd4c665ee477655c663accb8891279
Merge: d24acc008 a999cb43d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 5 13:00:07 2019 -0500

    Merge branch 'maint-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(-)