commit d22963938f183c0fdf9a268e122eadc590b05871 Merge: 54e25ab12 f7eff2f8c Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 1 16:10:47 2018 -0500

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