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

[nickm at torproject.org]

commit c417210ff3f52a2b0f8783fee807db95d4fe8d93
Merge: a880429 58dfebb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 26 11:18:32 2011 -0500

    Merge remote branch 'origin/maint-0.2.2'

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