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

[nickm at torproject.org]

commit 4f2ef558e726ddad988430c666831793cbcbe544
Merge: 5c1ea692e 87aacbfbb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 09:38:26 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27177              |  4 ++++
 src/rust/protover/protoset.rs | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)