[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug19483-fix-v2'

[nickm at torproject.org]

commit a31f55b16ba26c5c3720640bf27157fd7ab45c40
Merge: 4dc7b3c 69535f1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 30 11:04:13 2016 -0400

    Merge remote-tracking branch 'teor/bug19483-fix-v2'

 src/common/util.c    | 14 ++++++++++----
 src/test/test_util.c | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)