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