commit 58758e713f69a6ce2c66367d8524df578520a036 Merge: c010611 da6aa7b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 27 09:15:52 2015 -0400 Merge remote-tracking branch 'yawning/bug16674' changes/bug16674 | 5 +++++ src/common/util.c | 6 ++++++ src/test/test_util.c | 12 ++++++++++++ 3 files changed, 23 insertions(+)