]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66
treeb0337af07992d99951fe7a9bc34c20ab7160e2e0
parent882fb8383da941ec8bec7a698caacd5924f25892
parent73a0bb16b9b750be9a51470ff57ee654787836d9
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.