[tor-commits] [tor/master] Merge branch 'ticket28177'

[nickm at torproject.org]

commit 76da5f8b807bfad1763e6ce3ac6dfba3725c9c13
Merge: 31ecbce3b c0bd800d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 24 12:59:51 2018 -0400

    Merge branch 'ticket28177'

 src/test/test.c | 20 ++++++++++----------
 src/test/test.h | 34 +++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 27 deletions(-)