[tor-commits] [manual/master] Merge branch 'redundant-mobile-tor'