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

[nickm at torproject.org]

commit 1f18b5a5d532449f46a9c4b74d188870ea56d813
Merge: c319949 f43aceb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat May 28 02:13:14 2011 -0400

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

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