Correct small whitespace inconsistency, lost while renaming variables. TOR_BUG_3246

Correct previous dual key logic pending first delivery installment. TOR_BUG_3246

Revert simplistic fix pending revisit of Mozilla integration attempt. TOR_BUG_9701

(0) -3 +3 +10 tip

mercurial