[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit c13dc5170f09473ec2255501cbb1c0433bd959e5
Merge: 0f7e960 31f253a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 9 11:54:45 2012 -0500

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/bug5090   |    7 +++++++
 src/common/util.c |   24 ++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)