]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Mar 2014 17:55:55 +0000 (13:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Mar 2014 17:55:55 +0000 (13:55 -0400)
commit2fae74d6c3e84eef24d628f55898c27a2ffa23f7
tree7bc2237ef486d8c9ea86c2438e159c11dd3c9966
parent452aa186800cbdeea13c9c5e40b78984db0616a1
parenta83abcf5ee5cb8fe245bc97e089e082f62921194
Merge remote-tracking branch 'origin/maint-0.2.4'

This is an "ours" merge, taking nothing, since we already had the
changes that were in a83abcf5ee5cb8fe245bc97e0