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

[arma at torproject.org]

commit d52b86a6c8edbbd8baa46536a88676c02960f99a
Merge: 5477796 bebd95e
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Jan 15 19:57:54 2011 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

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