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

[nickm at torproject.org]

commit aef0607f3810ef47f0b13b5ed1d553578940dd7c
Merge: 3716ddf1b c27bb4072
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 8 10:11:57 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug26196  |  4 ++++
 src/or/protover.c | 13 +++++++++++++
 2 files changed, 17 insertions(+)