Fix some if/else syntax
Merge branch 'master' of git://git.torproject.org/https-everywhere