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

[arma at torproject.org]

commit 58dfebbcb41b4b13b7aad3cccf85c85e4c6bc2c6
Merge: 46f36f3 741ef2a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 26 11:18:19 2011 -0500

    Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

 contrib/tor-exit-notice.html |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)