Commit 99cd818741c9f15e0c9ba1c4bbc8ff12b5e71d7b

Nick Mathewson 2014-01-22T11:46:52

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