[tor-commits] [torbrowser/maint-2.2] Merge branches 'bug2406' and 'master'