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

[nickm at torproject.org]

commit bffa1584144131564b4317cf6caaa2c031e5e140
Merge: c0c487073 f7eff2f8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:10:47 2018 -0500

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25249         |   3 +
 changes/bug25249.2       |   3 +
 changes/trove-2018-001.1 |   6 ++
 changes/trove-2018-004   |   8 +++
 src/or/protover.c        |  35 ++++++++--
 src/test/test_protover.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 220 insertions(+), 6 deletions(-)