[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

[arma at torproject.org]

commit 879f1718ad59682387ffc54b9d8589badb5f1e81
Merge: 48c4d53 151ab61
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Mar 11 17:39:54 2011 -0500

    Merge branch 'maint-0.2.1' into maint-0.2.2

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