Commit 4f360f89ca1e089732853463fd0bc07d95142704

Nick Mathewson 2014-11-30T10:23:39

Merge remote-tracking branch 'origin/pr/186'