commit 31cc0d2c0bce11dbddec9e5869fdb2ce1acc001d Merge: 92f71b8e8 4b6b58ed8 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 15 16:11:29 2018 -0500

Merge branch 'maint-0.3.5'

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