[tbb-commits] [tor-android-service/master] Merge remote-tracking branch 'sysrqb/bug31192_00'