Re-allow http TOS/PP agreements.

fixes #3469
Merge pull request #3485 from mozilla/hotfix-2013.05.22-allow-http-tos

Re-allow http TOS/PP agreements. Thanks @stomlinson.