Commit 26e85fcce4eb48186f3cc788dfb6010b845d4a6a

Nick Mathewson 2012-01-09T16:54:19

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