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

[arma at torproject.org]

commit 6d1ddd78653b1b28c613798e9cf77c75c992f42e
Merge: 5f63f0d 9bb947e
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jan 18 19:13:46 2011 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

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