[or-cvs] [tor/master] Merge remote branch 'sebastian/bug2450' into maint-0.2.2

[nickm at torproject.org]

commit e94ee583d6f81f2375ea9126e77495aeb3ca18bf
Merge: 2fa9ddb f2bb7b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 3 13:59:58 2011 -0500

    Merge remote branch 'sebastian/bug2450' into maint-0.2.2

 changes/bug2450 |    5 +++++
 doc/tor.1.txt   |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)