[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit f8d5fb42a392a764da9f46102583ea2dff960939
Merge: 73ba308d3 4fa46fca8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 12 17:24:41 2018 -0400

    Merge branch 'maint-0.3.3' into maint-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(-)