Commit 18653fcae77fd0a5a6397cdf3acc8df853d62a62

Nick Mathewson 2012-01-24T11:17:06

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