commit 97324a731f5cbdfd0a00b852f4388c3dd149c7fa Merge: ee1cc0fea 7bf9c93ab Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 30 09:35:07 2018 -0400

Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5

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