From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Oct 2013 16:07:01 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66;p=thirdparty%2Ftor.git

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.
---

0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66