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

[nickm at torproject.org]

commit e676db656da1c3911f0667faa4fd2396db1c9e8f
Merge: 285cf99 1f18b5a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat May 28 02:13:25 2011 -0400

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

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