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