Re-allow http TOS/PP agreements.

fixes #3469
Merge pull request #3486 from mozilla/issue_3469-allow-http-tos

Re-allow http TOS/PP agreements.