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

[nickm at torproject.org]

commit 9201e4c74b10c28b551e6ac4d4e1830f5386b481
Merge: 03e102c1b 75659fd54
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 15 14:27:58 2017 -0400

    Merge branch 'bug23487_029'

 changes/bug23487  |  5 +++++
 src/common/util.c | 22 ++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)