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

[nickm at torproject.org]

commit 156e9723bfda28b9cddbc081e80adc75a4c3423e
Merge: 8a6e2d5da 7b1a3c516
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 21 08:36:48 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26435  | 5 +++++
 src/or/protover.c | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)