[tbb-commits] [torbutton/master] Merge remote-tracking branch 'arthur/14937+7'