[WIP] Make ohttp compile again#4

nothingmuch wants to merge 3 commits intopayjoin:mainpayjoin/ohttp:mainfrom

nothingmuch:make-ohttp-compile-againnothingmuch/ohttp:make-ohttp-compile-againCopy head branch name to clipboard