Merge remote-tracking branch 'gargoyle/master'
Merge remote-tracking branch 'gargoyle/master'
plugin tor: typo
Merge remote-tracking branch 'obsy/master'