Commit 90a8c539aa633ce7a2a3001ede09f450f89d5fc2

Nick Mathewson 2013-06-10T15:17:34

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