[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug25070'

[nickm at torproject.org]

commit 5516d22a26648f2f3c05324a854cf573b4b5e39c
Merge: 9773cd0f9 e4528624b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 1 15:28:25 2018 -0500

    Merge remote-tracking branch 'teor/bug25070'

 src/rust/protover/protover.rs |   4 +-
 src/test/test_protover.c      | 152 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 154 insertions(+), 2 deletions(-)