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