]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Fri, 23 Jan 2015 13:52:55 +0000 (08:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 23 Jan 2015 13:52:55 +0000 (08:52 -0500)
commit7cbdec578b291da11dcd419988ee985b7589ec48
tree87f1867d76cf740e83a0655260130b47c94c3824
parentba17cdfb0a80c5f6e86eb7b6e510eb72a9352b83
parentdf4c484021a2c4086084b82f9eade29231c038f9
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5