[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3

[nickm at torproject.org]

commit 038bc21f8894043fbdda0cc87adddfbad84f65c4
Merge: 8013e3e8b 80ad15921
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 30 09:33:36 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3

 changes/bug27741         |  5 +++++
 src/rust/protover/ffi.rs | 13 ++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)