]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Sep 2014 01:41:56 +0000 (21:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Sep 2014 01:41:56 +0000 (21:41 -0400)
commit974f4d2ceb0c494bc5008749928bd2d49317cf0b
tree22b680294ca5f0fec05f46f28597f1e0b87a440a
parent383238b2f6d30120f1f5c9f99327c3194dbd0654
parent550c03336ccc256dd9221d2cf9fdc5cef1f87908
Merge remote-tracking branch 'origin/maint-0.2.5'

(Do an "ours" merge to avoid taking version number changes)