commit 6492a75b9f23ff4d22aa4b4ffa2fe4a4f7193bad Merge: 9ab3b33 3795349 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 14 09:54:08 2012 -0400 Merge branch 'bug6831_v2' changes/bug6831 | 4 ++++ src/common/util.c | 18 +++++++++++++++--- src/test/test_util.c | 13 ++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-)