[tor-commits] [torbutton/master] Merge remote-tracking branch 'richardgl/40416_rev2'