]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81fcebc c718921)
Merge remote-tracking branch 'karsten/task-6266'
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Dec 2012 16:39:56 +0000 (11:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Dec 2012 16:39:56 +0000 (11:39 -0500)

Trivial merge
Mirror of https://git.torproject.org/tor.git