[or-cvs] [tor/maint-0.2.2] Merge maint-0.2.1 with -s ours.

[nickm]

commit 7abb74e4ac3f284f0682764dd5f26571dd624c13
Merge: 20d4933 50c259d
Author: Nick Mathewson <ni...@torproject.org>
Date:   Thu Feb 10 15:56:06 2011 -0500

    Merge maint-0.2.1 with -s ours.