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

[nickm at torproject.org]

commit 3e9c86a8f964e8c6f11c57663bd4dc8998827eb5
Merge: 7992eb4 fbcd7c0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 20 20:16:49 2011 -0500

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

 changes/bug4521 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)