commit 585582fc8c77a19981af2887e0a9d7691c0a4845 Merge: 75e850e b5e142c Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 12 13:35:22 2014 -0400 Merge branch 'bug9781_v2' changes/bug9781 | 5 +++++ src/common/util.c | 63 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 47 insertions(+), 21 deletions(-)