Merge remote branch 'sebastian/exit-notice'
commitd784eecad9c2d25ff45b86e43a623b73c259b86f
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Feb 2010 17:47:38 +0000 (9 12:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Feb 2010 17:47:38 +0000 (9 12:47 -0500)
tree47be56c3474fe8131c9154cabd671a8ca72e127a
parentc0d682686ad8df66b1f6680b1185853532f24429
parent0e0c31b1b863bd996262e49d8df005e99ba8d5bc
Merge remote branch 'sebastian/exit-notice'