[tor-commits] [tor/master] Merge commit 'c1b36488e9c318fc414220e8549624b423560ad2'