]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78301d9 1289474)
Merge remote-tracking branch 'karsten/bug11742'
authorNick Mathewson <nickm@torproject.org>
Tue, 6 May 2014 17:54:37 +0000 (13:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 May 2014 17:54:37 +0000 (13:54 -0400)

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