Use "ours" strategy to avoid taking 73a0bb16b9b750be9a51470ff5 from 0.2.4. We _do_ want to keep torrc.sample.in changes in 0.2.5.