[tbb-commits] [tor-launcher/master] Merge remote-tracking branch 'isis/bug18113'