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

[nickm at torproject.org]

commit 25875f533b1798ef4e131124ed76a97b77f368c6
Merge: ceebc82 8ba1cf3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 11:55:11 2011 -0500

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

 changes/bug4424 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)