commit 0a276947ba6a04d303f59630b744045459d94504 Merge: 3687526 7255b11 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Feb 27 10:17:51 2016 +0100 Merge branch 'bug18392' src/common/util.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-)