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