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