[tbb-commits] [tor-android-service/master] Merge remote-tracking branch 'acatgh/40004'