commit 22338d63c4e579801788727ca3e09fc15f931622 Merge: de55df026 7bf9c93ab Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 30 09:33:58 2018 -0400 Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 19 ++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-)