[tor-commits] [torbrowser/master] Merge branches 'fixes-2011-08-23-01-master' and 'master'