[tor-commits] [tor/maint-0.2.3] Merge remote-tracking branch 'public/bug6225' into maint-0.2.3

[nickm at torproject.org]

commit 2703e072a1056edd3b68a16e045175e5bd268301
Merge: a6688c5 ffd7189
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 25 11:51:19 2012 -0400

    Merge remote-tracking branch 'public/bug6225' into maint-0.2.3

 src/common/util.c    |   34 ++++++++++++++++++++++++----------
 src/common/util.h    |    4 ++--
 src/test/test_util.c |   16 +++++++++++-----
 3 files changed, 37 insertions(+), 17 deletions(-)