commit d01abb9346bcb7b240b5277551ea75e85dfc160c Merge: bcfb03495 d4a758e08 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 1 16:07:59 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

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