]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 May 2014 13:17:34 +0000 (09:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 May 2014 13:17:34 +0000 (09:17 -0400)
commitef9c00f53962713e1f7866004f3b83a136cfcedc
tree821ce45b739d36d900146cdf38e3e54dc48a09bc
parent34552740b18b14d60ce5f6b67c77be13ca94bf14
parent8d9602c21ccc0d93c82c651d94791df88cf4c9ad
Merge remote-tracking branch 'origin/maint-0.2.4'

This is an "ours" merge, to avoid taking the commit that bumped
maint-0.2.4's version to 0.2.4.22-dev.