]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Oct 2013 20:09:45 +0000 (16:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Oct 2013 20:09:45 +0000 (16:09 -0400)
commit30b8fc3e0d5a2eafa052672619aaaac733f3fa3d
tree6ce4aa9678fec8bdf71ed942e5baa123b1cf57f2
parent66624ded3973ef9ad1e5fa5a3db53344186430e3
parentfa1034cd999f19a50e6183dac6c65b3acaefe856
Merge remote-tracking branch 'origin/maint-0.2.4'

Using "ours" strategy since we already merged the equivalent of #9866
into this branch.