commit 4b6b58ed8ec6f5870bf5825e0013339f0223fa06 Merge: a9db07f32 22338d63c Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 15 16:11:06 2018 -0500

Merge branch 'bug27740_035_fix' into maint-0.3.5

src/rust/protover/ffi.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)