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

[nickm at torproject.org]

commit b6b239ce0c3d1ee5f7f829d8d795e489c2358948
Merge: ce9df228a d4a758e08
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:07:59 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 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(-)