Commit 2fbc3b148b1f3734d8e1d5bccb0861502ffba4e7

Nick Mathewson 2013-12-24T12:45:22

Merge remote-tracking branch 'resetius/https'