Commit 0fb71c35dc5763afc32f9ef5641cd2f50745f066

Nick Mathewson 2014-10-09T10:14:30

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