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

[nickm at torproject.org]

commit b8e582255e8ee920904c71ed9d4ff3927f22757a
Merge: 6a9e693 b80728a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 3 12:06:07 2012 -0400

    Merge remote-tracking branch 'asn-mytor/bug5558_take2'

 changes/bug5558      |    3 +++
 src/common/util.c    |    2 +-
 src/test/test_util.c |    6 +++++-
 3 files changed, 9 insertions(+), 2 deletions(-)