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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into release-0.3.3

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