Partially revert "Clarify who learns about ContactInfo."

This reverts the torrc.sample.in changes from commit
66a04a6ac334775dc396025e0c15fa49eca138a7.

We're going to not make this change in 0.2.4, since changing
torrc.sample.in makes all the debian users do some pointless
busywork. see tor-dev discusion of 9 Oct 2013.
Merge remote-tracking branch 'origin/maint-0.2.4'

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