commit 0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66 Merge: 882fb83 73a0bb1 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 9 12:07:01 2013 -0400

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.