Commit 279319766342c5d12c9f70716cab4d9d4895c94c

Nick Mathewson 2012-02-11T21:20:47

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