commit e6e929f5cf5d548d64c4400c0a5036d16b8c4046 Merge: 73182e3 da6720e Author: Nick Mathewson <nickm@torproject.org> Date: Fri Feb 15 16:37:53 2013 -0500 Merge remote-tracking branch 'public/bug8209' changes/bug8209 | 6 ++++++ src/common/util.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)