commit 05d65cb067d542a2d7eb001aa300fd8b836a84a0 Merge: afc22ec53 289a7dbac Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 23 19:22:05 2018 -0400 Merge branch 'maint-0.3.5' changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 3 +++ src/test/test_protover.c | 1 + 4 files changed, 11 insertions(+)