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

[nickm at torproject.org]

commit 18f836ee8f63af4506a56ca55cab3333637864b6
Merge: 2fd064d 7072dd5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Oct 27 16:48:05 2012 -0400

    Merge remote-tracking branch 'asn/bug6832'

 src/test/test_util.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)