[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

[arma at torproject.org]

commit 0b07b5dc989b50cb9fad82efe946f160713420cf
Merge: 4740311 879f171
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Mar 11 17:40:16 2011 -0500

    Merge branch 'maint-0.2.2'

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