Commit 7fd4941465e42ec46721150e7ccf1aa2d2bf670b

Nick Mathewson 2014-11-30T19:26:20

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