[tor-commits] [sbws/master] Merge branch 'master' into issue155