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

[nickm at torproject.org]

commit ac721bd3b4223586b004df5f8be1b05069bf6855
Merge: b49355915 cc93f175e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 09:29:46 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27164              |  4 ++++
 src/rust/protover/protoset.rs | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)