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

[arma at torproject.org]

commit 41b60af271826162bae94cf6b91adf7f578b380e
Merge: 2cb9ed2 5110490
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Jan 15 19:56:36 2011 -0500

    Merge branch 'maint-0.2.1' into release-0.2.1

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