[or-cvs] [tor/master] Merge branch 'maint-0.2.1' into maint-0.2.2

[arma@xxxxxxxxxxxxxx]

commit bebd95e2c99ab3d17ebf6d1b005f483af079330a
Merge: a7790d4 5110490
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Sat Jan 15 19:57:01 2011 -0500

    Merge branch 'maint-0.2.1' into maint-0.2.2

 ReleaseNotes |   66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)