[tor-commits] [stegotorus/master] Merge branch 'master' into stegotorus