Commit 8bf769c47af11b484295c9e7189f756aa106c64e

Nick Mathewson 2014-08-29T14:32:10

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: sample/http-server.c