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

[arma at torproject.org]

commit 369994a6e92bb48064e541de5777a09bab70b7fe
Merge: 0f728e2 9bb947e
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jan 18 19:15:00 2011 -0500

    Merge branch 'maint-0.2.2'

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