[tor-commits] [pups/production] Merge remote-tracking branch 'sherief/bug12153'