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

[nickm at torproject.org]

commit 79c56a6e312508b6ff44777ea20667cc475955aa
Merge: 0c9d61776 a14112743
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 8 10:12:57 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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