[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug6779'

[nickm at torproject.org]

commit d2d7cab5b83e49aba4ae8ecf0aabb9dfcda8d31e
Merge: deee0b6 93c38b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 6 10:12:15 2012 -0400

    Merge remote-tracking branch 'asn/bug6779'

 src/common/util.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)