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

[arma@xxxxxxxxxxxxxx]

commit 6a6e3adf0170c03c827268cfa8bcd3c25d4bff74
Merge: 6ccb164 bebd95e
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Sat Jan 15 20:08:37 2011 -0500

    Merge branch 'maint-0.2.2'

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