[tor-commits] [community/master] Merge commit 'aa59a59d108fab414610367eb78c59ed81f3e274'