]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 882fb83 73a0bb1)
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2013 16:07:01 +0000 (12:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2013 16:07:01 +0000 (12:07 -0400)
Use "ours" strategy to avoid taking 73a0bb16b9b750be9a51470ff5
from 0.2.4.  We _do_ want to keep torrc.sample.in changes in 0.2.5.


Trivial merge
Mirror of https://git.torproject.org/tor.git