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

[nickm at torproject.org]

commit 9d9b8a5a06dd25a91f41c49398b18fc9f5064656
Merge: c0d1ba2e9 cf2cb783b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 30 09:34:04 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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