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

[nickm at torproject.org]

commit 1cc8c1e8a579e4fad4304d9538bab8d90a8ad32a
Merge: f4d7a7527 038bc21f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 30 09:34:04 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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