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

[arma at torproject.org]

commit 9bb947ea149908aa14d9ba7ec67e351da6471812
Merge: 7699014 8875a02
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jan 18 19:13:24 2011 -0500

    Merge branch 'maint-0.2.1' into maint-0.2.2

 ReleaseNotes |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)