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