Commit 290154271460e61f07dbcaaa3bf80914742236ef

Nick Mathewson 2013-02-05T15:09:31

Merge remote-tracking branch 'origin/patches-2.0'