commit 8a0728789b1943ba39f41c1f09fe5da50838464c Merge: cf1906542 169bc670d Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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(-)