commit 271144c99e00d0596d3a8f7e2c278f2b2789c115 Merge: 64f363737 7edc594ee Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)