[tor-commits] [community/staging] Merge branch 'staging' into 'master'