[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit e0b8c53f56441eb0a8d9ebc5d579b520a31291c6
Merge: bedc0b0b8 700f5bcc4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 09:38:26 2018 -0400

    Merge branch 'maint-0.3.4'

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