Commit 1cae3ae16704a7c3ef18da7d1b7ea431381c1232

Nick Mathewson 2015-02-02T13:57:50

Merge remote-tracking branch 'public/master'