]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e3cf3e 795c0f7)
Merge remote-tracking branch 'karsten/task-9854-2'
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2013 16:36:24 +0000 (12:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2013 16:36:24 +0000 (12:36 -0400)

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