Allow trivial-validate.py to validate single file

If the first argument to trivial-validate is an existing file,
then only run validation tests on that file. Optionally, specify
a directory in which to check for duplicates of this file.
Ex: python trivial-validate.py <filename> <rulesets-directory-name>

Otherwise, if the argument is a directory, default to previous
behavior.
Merge remote-tracking branch 'upstream/3.0' into 3.0
Don't change dir if validating single file
Merge remote-tracking branch 'upstream/3.0' into 3.0
Merge remote-tracking branch 'upstream/3.0' into 3.0
Disable https for Cloudfront services on Droplr

As reported in https://trac.torproject.org/projects/tor/ticket/8572,
some Droplr content does not display with the Cloudfront rule.
[cloudfront] fix Droplr issue

As reported in https://trac.torproject.org/projects/tor/ticket/8572,
some Droplr content does not display with the Cloudfront rule.
Merge branch '3.0' of https://github.com/diracdeltas/https-everywhere into 3.0