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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into release-0.3.3

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