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

[nickm at torproject.org]

commit e818a7190599ff46184e1b8541b2317c145e6d8d
Merge: 163230e24 2cadd93ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 21 09:35:54 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27316         |  3 +++
 src/or/protover.c        | 17 ++++++++++++++++-
 src/test/test_protover.c |  4 ++++
 3 files changed, 23 insertions(+), 1 deletion(-)