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

[arma at torproject.org]

commit a2fe17bae230f07ba16d5f99849c2e2f5890c729
Merge: 41b60af 8875a02
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jan 18 19:12:57 2011 -0500

    Merge branch 'maint-0.2.1' into release-0.2.1

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