[tor-commits] [tor-android-service/master] Merge remote-tracking branch 'phwgh/task/32891'