commit 04f210811e1ea32abdd4d610c01db0ad084d6952 Merge: 204a90c93 f8d5fb42a Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 12 17:24:41 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27649 | 4 ++++ src/rust/protover/protoset.rs | 17 ++++++++--------- src/rust/protover/protover.rs | 4 ++-- src/rust/protover/tests/protover.rs | 14 +++++++------- src/test/test_protover.c | 22 +++++++++++----------- 5 files changed, 32 insertions(+), 29 deletions(-)