[tbb-commits] [tor-launcher/master] Merge branch 'bug_30319_v2'