[tor-commits] [chutney/master] Merge remote-tracking branch 'linus/bug8531'