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

[nickm at torproject.org]

commit d4a758e08373854639af6991ec95836fa7c15ca4
Merge: ac1942ac5 c1bb8836f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:07:59 2018 -0500

    Merge branch 'maint-0.2.9' into maint-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(-)