[tor-commits] [community/staging] Merge remote-tracking branch 'nick/master'