commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f Merge: c4b6b5738 038bc21f8 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 30 09:34:04 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

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