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

[nickm at torproject.org]

commit bc8b5fb559be9044c7c32e7cdadbe02795b85e60
Merge: 43d44c04f d01abb934
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:07:59 2018 -0500

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